Colin Cross
c2bf5dd2a3
Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f am: d4ada79abd
...
am: 2172041a44
2019-03-27 11:33:24 -07:00
Colin Cross
2172041a44
Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f
...
am: d4ada79abd
2019-03-27 11:25:16 -07:00
Colin Cross
d4ada79abd
Merge "Understand the support library/androidx @Keep annotations"
...
am: 3f6483cb0f
2019-03-27 11:21:37 -07:00
Colin Cross
38b48debc5
Understand the support library/androidx @Keep annotations
...
Copied from tools/base/build-system/gradle-core/src/main/resources/com/android/build/gradle/proguard-common.txt.
Fixes: 129311848
Test: none
Change-Id: Ie8b40b416c8772a550bb4d1f7bd6e7e944cdd166
2019-03-26 23:44:01 +00:00
Sasha Smundak
ef6827f985
Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9 am: aa2eb553d8
...
am: 20f8f5c6ee
2019-03-26 15:36:52 -07:00
Sasha Smundak
20f8f5c6ee
Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9
...
am: aa2eb553d8
2019-03-26 15:27:16 -07:00
Sasha Smundak
aa2eb553d8
Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true"
...
am: d7060a50f9
2019-03-26 14:19:30 -07:00
Treehugger Robot
d7060a50f9
Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true"
2019-03-26 20:22:37 +00:00
Daniel Norman
cf4e8bf0b5
Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." am: b455273444 am: 7100e93233
...
am: 2d5f9a0285
2019-03-25 16:33:11 -07:00
Daniel Norman
2d5f9a0285
Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." am: b455273444
...
am: 7100e93233
2019-03-25 16:29:24 -07:00
Daniel Norman
7100e93233
Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE."
...
am: b455273444
2019-03-25 16:25:20 -07:00
Sasha Smundak
da25b691d3
Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true
...
Bug: 117224272
Test: treehugger
Change-Id: Idd47ead31fcd89dbf728f140dc3353e5013ba352
2019-03-25 13:26:03 -07:00
Daniel Norman
adf8096c77
Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE.
...
The recovery patch gets put in the SYSTEM directory. Placing the
recovery patch here doesn't make sense when not building the system
image, as is the case for merged (system + vendor) builds.
Bug: 128838154
Test: Running make droid dist for a device target that sets PRODUCT_BUILD_SYSTEM_IMAGE to false.
Change-Id: Ib5ce8c8490024199f82d0c093e9a7ae2de5f71f5
2019-03-25 18:34:30 +00:00
Anton Hansson
db064f1f1a
Merge "Put DEVICE/PRODUCT overlays in different partitions" am: 94fa0e75cb am: fd946975d0
...
am: 691c979b62
2019-03-25 02:46:53 -07:00
Anton Hansson
691c979b62
Merge "Put DEVICE/PRODUCT overlays in different partitions" am: 94fa0e75cb
...
am: fd946975d0
2019-03-25 02:38:24 -07:00
Anton Hansson
fd946975d0
Merge "Put DEVICE/PRODUCT overlays in different partitions"
...
am: 94fa0e75cb
2019-03-25 02:32:55 -07:00
Anton Hansson
94fa0e75cb
Merge "Put DEVICE/PRODUCT overlays in different partitions"
2019-03-25 09:25:47 +00:00
Martin Stjernholm
0e727dd0eb
Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." am: c62e31242d am: 5355757f74
...
am: 2242264224
2019-03-22 08:53:54 -07:00
Martin Stjernholm
2242264224
Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." am: c62e31242d
...
am: 5355757f74
2019-03-22 08:47:09 -07:00
Martin Stjernholm
5355757f74
Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds."
...
am: c62e31242d
2019-03-22 08:43:22 -07:00
Martin Stjernholm
c62e31242d
Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds."
2019-03-22 15:35:09 +00:00
Martin Stjernholm
d185bb29ce
Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds.
...
Test: m systemimage
Bug: 124293228
Change-Id: I7a4744457396084ef9fd78d9c2f1efdabe0f981d
2019-03-22 14:24:08 +00:00
Anton Hansson
cb8276fa93
Put DEVICE/PRODUCT overlays in different partitions
...
This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS
to be generated in the vendor partition, as opposed to /product where
they were generated in the past.
Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages
to /product, which means that a single app can be overlayed from
different partitions. These RROs have been given module and package
names based on their location.
Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-22 13:25:20 +00:00
Martin Stjernholm
0e60df18e6
Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}." am: 02699e40ea am: 057b589a96
...
am: d3409149eb
2019-03-22 05:55:42 -07:00
Martin Stjernholm
d3409149eb
Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}." am: 02699e40ea
...
am: 057b589a96
2019-03-22 05:50:28 -07:00
Martin Stjernholm
057b589a96
Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}."
...
am: 02699e40ea
2019-03-22 05:46:18 -07:00
Treehugger Robot
02699e40ea
Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}."
2019-03-22 12:34:05 +00:00
Jiyong Park
b52d505cf6
Merge "Follow symlink when creating symbols.zip" am: 1d38fe98d1 am: ca6cd2dcd3
...
am: 3bbb92bc72
2019-03-21 15:41:18 -07:00
Jiyong Park
3bbb92bc72
Merge "Follow symlink when creating symbols.zip" am: 1d38fe98d1
...
am: ca6cd2dcd3
2019-03-21 15:36:57 -07:00
Jiyong Park
ca6cd2dcd3
Merge "Follow symlink when creating symbols.zip"
...
am: 1d38fe98d1
2019-03-21 15:32:42 -07:00
Treehugger Robot
1d38fe98d1
Merge "Follow symlink when creating symbols.zip"
2019-03-21 22:19:49 +00:00
Martin Stjernholm
f1e7c7159b
Check that Runtime APEX libraries don't end up in /system/${LIB}.
...
This is a stop-gap measure for a proper fix enforcing library "ownership" in
Soong: b/128708192
Test: m systemimage (with and without libs that exist in /system/lib)
Test: Check that this fails:
m systemimage
m out/target/product/taimen/system/lib/libjdwp.so
m systemimage-nodeps
Bug: 124293228
Change-Id: Iac0d0cec7d9e216028a0caccfbb76838514d4a7b
2019-03-21 17:52:35 +00:00
Anton Hansson
64e23e56dd
Merge "Read product/device RRO dirs separately from soong" am: cece1e03af am: df12b23c07
...
am: b66ccd067d
2019-03-21 04:45:47 -07:00
Anton Hansson
b66ccd067d
Merge "Read product/device RRO dirs separately from soong" am: cece1e03af
...
am: df12b23c07
2019-03-21 04:41:36 -07:00
Anton Hansson
df12b23c07
Merge "Read product/device RRO dirs separately from soong"
...
am: cece1e03af
2019-03-21 04:36:24 -07:00
Anton Hansson
cece1e03af
Merge "Read product/device RRO dirs separately from soong"
2019-03-21 11:28:19 +00:00
Jiyong Park
88e0980ddf
Follow symlink when creating symbols.zip
...
Due to the runtime APEX, the symbols directory now contains a symlink;
./apex/com.android.runtime -> com.android.runtime.debug (or .release).
Previously, this symlink itself was included in the symbols.zip file.
And this is causing problem to the online stack tool which does not
follow the symlink in the zip file. Instead of fixing the problem in the
stack tool side, this change let the packaging routine to follow the
symlink and copy the files behind the symlink as if they were under a
directory that isn't a symlink. (i.e.
./apex/com.android.runtime/bin/dex2oat is added)
Bug: 120846816
Test: m dist with marlin (flattened) and blueline (non-flattened)
examine symbols.zip file and check that unstripped shared libraries are
found under /apex/com.android.runtime directory
Change-Id: I1d1c787a2e8ab7209410dfa2cff749a7042e21b0
2019-03-21 18:48:16 +09:00
Bowgo Tsai
d97130751f
Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f am: 20d5f0f821
...
am: 5ce2f09a8e
2019-03-21 00:24:04 -07:00
Bowgo Tsai
5ce2f09a8e
Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f
...
am: 20d5f0f821
2019-03-21 00:18:52 -07:00
Bowgo Tsai
20d5f0f821
Merge "Only build system_other.avbpubkey when AVB is enabled"
...
am: dce018769f
2019-03-21 00:13:43 -07:00
Bowgo Tsai
8802b7119d
Only build system_other.avbpubkey when AVB is enabled
...
/product/etc/security/avb/system_other.avbpubkey is only needed
when BOARD_AVB_ENABLE is true. This fixes the build error of
Marlin/Sailfish.
Bug: 123611926
Bug: 129029207
Test: make
Change-Id: I73f948d84f91cd6fbe49a2de7bf12e46eebe6ede
2019-03-21 14:26:33 +08:00
Vic Yang
5c38a6234d
Merge changes from topic "vndk-no-vendor-variant" am: 30dda1da5e am: 38f68f7a2a
...
am: 1485ea8707
2019-03-20 21:58:12 -07:00
Vic Yang
a2872a3578
Add module-target-built-files function am: 1b83413b5a am: 00e6eb93c9
...
am: 9b235bbcd5
2019-03-20 21:57:17 -07:00
Vic Yang
1485ea8707
Merge changes from topic "vndk-no-vendor-variant" am: 30dda1da5e
...
am: 38f68f7a2a
2019-03-20 21:46:43 -07:00
Vic Yang
9b235bbcd5
Add module-target-built-files function am: 1b83413b5a
...
am: 00e6eb93c9
2019-03-20 21:45:57 -07:00
Bowgo Tsai
dc80ab1bf0
Merge "Moving system_other key into product.img" am: 7e87c72fb0 am: 916e876f7a
...
am: 44446b2a50
2019-03-20 21:45:30 -07:00
Bowgo Tsai
44446b2a50
Merge "Moving system_other key into product.img" am: 7e87c72fb0
...
am: 916e876f7a
2019-03-20 21:40:19 -07:00
Vic Yang
38f68f7a2a
Merge changes from topic "vndk-no-vendor-variant"
...
am: 30dda1da5e
2019-03-20 21:39:57 -07:00
Vic Yang
00e6eb93c9
Add module-target-built-files function
...
am: 1b83413b5a
2019-03-20 21:38:59 -07:00
Bowgo Tsai
916e876f7a
Merge "Moving system_other key into product.img"
...
am: 7e87c72fb0
2019-03-20 21:36:24 -07:00
