Bug: 33381544
Test: m clean; mma -j with a prebuilt aar using aapt2
Change-Id: Ie41def84aa35f3774abd6d713fb4a75d63a88876
Merged-In: Ie41def84aa35f3774abd6d713fb4a75d63a88876
(cherry picked from commit c401a62d81)
Revert by Build Cop. This change is causing build failures across builders and branches, e.g.:
ninja: error: 'out/target/product/generic_x86/obj/lib/android.hidl.base@1.0.so', needed by 'checkbuild', missing and no known rule to make it
09:08:08 ninja failed with: exit status 1
This reverts commit 76ada93856.
Change-Id: I5e7bfa65a70cf5d61fb233cdbdfe7f420fd5ab51
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.
The common part inclueds:
- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configurations
Bug: 37927875
Test: boot to home screen with the generic system image
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
Move the common part from make file of generic AOSP system images into
treble_common.mk, and update the content of common part.
The common part inclueds:
- HAL interfaces
- VNDK libs
- VNDK-SP libs
- Some other modules supporting HAL interfaces
- Some Treble default configuations
Bug: 37927875
Test: boot to home screen with the generic system image
Change-Id: I4202454d57970cef713f7d6437191094df0009e9
Merged-In: I4202454d57970cef713f7d6437191094df0009e9
This path needs to be set if we're going to build aar prebuilts with
aapt2.
Bug: 33381544
Test: Attempt to build an aar prebuilt with LOCAL_USE_AAPT2 := true, it
doesn't fail writing to /
Change-Id: I28c85736986221607a1d7a295ff1522b993a2049
Merged-In: I28c85736986221607a1d7a295ff1522b993a2049
(cherry picked from commit 48845257dc)
Currently we're writing META/misc_info.txt to the new TF.zip during
ReplaceVerityPrivateKey(). We should delay that until we have replaced
everything in need. Otherwise we won't be able to replace/overwrite
that zip entry (unless `zip -d` first).
This CL also cleans up the return value of ReplaceVerityPublicKey() and
ReplaceVerityKeyId(), since the caller no longer needs the values.
Test: sign_target_files_apks.py and check the generated signed TF.zip.
Change-Id: I9fbd7182247728281519e5e3971557f6b018ad65
Keyed on MATRIX_LEVEL_OVERRIDE, FULL_TREBLE, SHIPPING_API_LEVEL,
and SDK_VERSION.
Bug: 62136051
Test: m system_compatibility_matrix.xml -j; \
grep -e"gatekeeper" -B1 $OUT/system/compatibility_matrix.xml; \
grep -e"oemlock" -B1 $OUT/system/compatibility_matrix.xml
bullhead: gatekeeper is optional, no oemlock (legacy.xml)
marlin without COMP_LEVEL_OVERRIDE: gatekeeper is not optional,
no oemlock (26.xml)
marlin with COMP_LEVEL_OVERRIDE: gatekeeper is not optional,
oemlock exists (current.xml)
new devices with COMP_LEVEL_OVERRIDE: same as above.
Change-Id: Icf7269df91950a8c3585a7e5f0022e6737954b77
oc-dev-plus-aosp will become aosp master, which needs to continue to
be able to build features targeted at PPR1.
This reverts commit 096aaeee16.
Bug: 36891159
Test: builds
Change-Id: I7060a5742609e96102027eea528e0e2db8e7b129
Merged-In: I546d1c25a2b1d948a0e7da796f59e734a98635da
Dan Willemsen