Explorar el Código

remove-minimal.xml: Partial changes needed for FBE decryption

* This is only a partial commit. Some repos still need to be
  included manually, see the comment about android_frameworks_base.
  And some additional libs/dirs are needed from AOSP r34 source
  since they are not yet available (or updated) in the current omni
  repo at the time of this writing.

* Using AOSP android-8.0.0_r34 tag:

  For at least a build:
    Add: frameworks/base/core/java/android/content
    Add: frameworks/base/core/java/android/security

  For weaver:
    Add: hardware/interfaces/weaver

  For libkeymaster1.so -> libkeymaster_portable.so and libkeymaster_staging.so
    Replace: system/keymaster
    Replace: system/security/keystore

  For libkeyutils.so
    Add: system/core/libkeyutils
nkk71 hace 8 años
padre
commit
70da2068a8
Se han modificado 1 ficheros con 10 adiciones y 5 borrados
  1. 10 5
      remove-minimal.xml

+ 10 - 5
remove-minimal.xml

@@ -23,7 +23,6 @@
     <remove-project name="platform/external/autotest" />
     <remove-project name="platform/external/autotest" />
     <remove-project name="platform/external/blktrace" />
     <remove-project name="platform/external/blktrace" />
     <remove-project name="platform/external/bsdiff" />
     <remove-project name="platform/external/bsdiff" />
-    <remove-project name="platform/external/bzip2" />
     <remove-project name="platform/external/c-ares" />
     <remove-project name="platform/external/c-ares" />
     <remove-project name="platform/external/caliper" />
     <remove-project name="platform/external/caliper" />
     <remove-project name="platform/external/cblas" />
     <remove-project name="platform/external/cblas" />
@@ -241,7 +240,6 @@
     <remove-project name="platform/hardware/broadcom/libbt" />
     <remove-project name="platform/hardware/broadcom/libbt" />
     <remove-project name="platform/hardware/broadcom/wlan" />
     <remove-project name="platform/hardware/broadcom/wlan" />
     <remove-project name="platform/hardware/google/apf" />
     <remove-project name="platform/hardware/google/apf" />
-    <remove-project name="platform/hardware/libhardware_legacy" />
     <remove-project name="platform/hardware/marvell/bt" />
     <remove-project name="platform/hardware/marvell/bt" />
     <remove-project name="platform/hardware/qcom/bootctrl" />
     <remove-project name="platform/hardware/qcom/bootctrl" />
     <remove-project name="platform/hardware/qcom/data/ipacfg-mgr" />
     <remove-project name="platform/hardware/qcom/data/ipacfg-mgr" />
@@ -370,11 +368,8 @@
     <remove-project name="platform/system/connectivity/wificond" />
     <remove-project name="platform/system/connectivity/wificond" />
     <remove-project name="platform/system/connectivity/wifilogd" />
     <remove-project name="platform/system/connectivity/wifilogd" />
     <remove-project name="platform/system/chre" />
     <remove-project name="platform/system/chre" />
-
-    <remove-project name="platform/system/hardware/interfaces" />
     <remove-project name="platform/system/libufdt" />
     <remove-project name="platform/system/libufdt" />
     <remove-project name="platform/system/nvram" />
     <remove-project name="platform/system/nvram" />
-    <remove-project name="platform/system/tools/aidl" />
     <remove-project name="platform/system/tpm" />
     <remove-project name="platform/system/tpm" />
     <remove-project name="platform/system/update_engine" />
     <remove-project name="platform/system/update_engine" />
 
 
@@ -406,7 +401,17 @@
     <!-- Remove from omni-aosp.xml (forked AOSP) -->
     <!-- Remove from omni-aosp.xml (forked AOSP) -->
     <remove-project name="android_development" />
     <remove-project name="android_development" />
 
 
+
+<!-- The following directories are actually needed
+     from android_frameworks_base (for FBE decryption)
+     * frameworks/base/core/java/android/content   (~4MB)
+     * frameworks/base/core/java/android/security  (<1MB)
+     but syncing a 1GB repo for 4 to 5MB is not worth
+     it for me.
+-->
     <remove-project name="android_frameworks_base" />
     <remove-project name="android_frameworks_base" />
+
+
     <remove-project name="android_frameworks_opt_telephony" />
     <remove-project name="android_frameworks_opt_telephony" />
 
 
     <remove-project name="android_hardware_invensense" />
     <remove-project name="android_hardware_invensense" />