diff options
author | Utkarsh Sanghi <usanghi@google.com> | 2015-11-23 15:47:50 -0800 |
---|---|---|
committer | Utkarsh Sanghi <usanghi@google.com> | 2015-11-23 15:47:50 -0800 |
commit | dc3159864e8476dd865fe1e6fa400c74fb5e7913 (patch) | |
tree | 45a7c9fcc848f49d02484d2ae7a64b031d020724 | |
parent | d202b086093e2783328acf79bf6a592c4ca48ede (diff) | |
download | manifest-dc3159864e8476dd865fe1e6fa400c74fb5e7913.tar.gz |
Remove attestation, tpm_manager, trunks and add tpm to the manifest.
We recently moved attestation, tpm_manager and trunks into system/tpm,
so that they can live in one repo. This CL removes the old attestation,
tpm_manager and trunks repos from the manifest and adds the new tpm
repo.
Bug: 25820760
-rw-r--r-- | default.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/default.xml b/default.xml index 3b2edb1..5e4d3d3 100644 --- a/default.xml +++ b/default.xml @@ -152,7 +152,6 @@ <project path="prebuilts/python/linux-x86/2.7.5" name="platform/prebuilts/python/linux-x86/2.7.5" groups="bdk,linux" /> <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="bdk" /> <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="tools,bdk" /> - <project path="system/attestation" name="platform/system/attestation" groups="bdk" /> <project path="system/bt" name="platform/system/bt" groups="bdk" /> <project path="system/ca-certificates" name="platform/system/ca-certificates" groups="bdk" /> <project path="system/connectivity/apmanager" name="platform/system/connectivity/apmanager" groups="bdk" /> @@ -166,8 +165,7 @@ <project path="system/netd" name="platform/system/netd" groups="bdk" /> <project path="system/security" name="platform/system/security" groups="bdk" /> <project path="system/tools/aidl" name="platform/system/tools/aidl" groups="bdk" /> - <project path="system/tpm_manager" name="platform/system/tpm_manager" groups="bdk" /> - <project path="system/trunks" name="platform/system/trunks" groups="bdk" /> + <project path="system/tpm" name="platform/system/tpm" groups="bdk" /> <project path="system/update_engine" name="platform/system/update_engine" groups="bdk" /> <project path="system/weaved" name="platform/system/weaved" groups="bdk" /> <project path="system/webservd" name="platform/system/webservd" groups="bdk" /> |