Commit Graph

60471 Commits

Author SHA1 Message Date
Kousik Kumar
7d61116cc1 Use soong_zip instead of jar to generate .jar files in javac actions
This is to make the jar-output deterministic so that we can get
cache-hits for r8/d8 actions from RBE.

Change-Id: I911ee702fa5dabfe7122e82b21f78c811a0c960d
Test: m droid checkbuild
2020-04-16 18:23:32 -07:00
Yo Chiang
85e68e75f1 Merge "Check ELF prebuilts in PRODUCT_COPY_FILES" am: 2cbcf3bda2
Change-Id: Iaf87ead13950c6f06ad3adcdb19b928833b156a1
2020-04-17 01:21:26 +00:00
Yo Chiang
2cbcf3bda2 Merge "Check ELF prebuilts in PRODUCT_COPY_FILES" 2020-04-17 01:06:32 +00:00
Steve Muckle
9793cf6c8a support multiple boot.img files in release tools
Support for generating multiple boot.img files is required in the
release tools to enable GKI distribution/signing.

Bug: 151094943
Change-Id: I536a286d3123f35918106a52c49b1148d746370f
2020-04-16 17:54:25 -07:00
easoncylee
dde942ca88 Copy shared libraries used by tests in device-tests_host_shared-libs.zip.
This change collects the shared libraries files used by tests in
device-tests_host_shared-libs.zip. Then the host test can be run in
TradeFed host based on build artifacts.

Bug: 151172861
Test: m -j device-tests
Change-Id: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
Merged-In: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
2020-04-17 08:18:12 +08:00
Treehugger Robot
624dfefb33 Merge "multi boot.img support cleanups" am: cffe5615f6 am: 140ae5e93b
Change-Id: Iffe07623699e56a3ed0d7d5e7655ffc5f4610d2b
2020-04-16 23:52:25 +00:00
Treehugger Robot
140ae5e93b Merge "multi boot.img support cleanups" am: cffe5615f6
Change-Id: I19e21822282a073222c33480ce9af5f8a60513c8
2020-04-16 23:35:39 +00:00
Treehugger Robot
cffe5615f6 Merge "multi boot.img support cleanups" 2020-04-16 23:22:52 +00:00
Treehugger Robot
874a6827bc Merge "Remove phony target vts-core" am: 86cafc59d5 am: c56e6cefc0
Change-Id: I517d0cd69b2d82979fa2c7418d31b5e04b7d4200
2020-04-16 21:32:57 +00:00
Treehugger Robot
c56e6cefc0 Merge "Remove phony target vts-core" am: 86cafc59d5
Change-Id: I2836a366442e2e8f75a01ef17493f659cc35249d
2020-04-16 21:11:17 +00:00
Treehugger Robot
86cafc59d5 Merge "Remove phony target vts-core" 2020-04-16 21:03:17 +00:00
Dan Shi
c581e59998 Remove phony target vts-core
The target has been removed from all builders.

Bug: 151896491
Test: none
Change-Id: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
2020-04-16 11:45:56 -07:00
Maciej Zenczykowski
7b11b68b45 [automerger skipped] Merge "remove dependency on ip6tables" into rvc-dev am: a11cf8fd7b -s ours
am skip reason: Change-Id I94709a7450d0c41a64951c592b54de4b2956eae9 with SHA-1 4cdfacae10 is in history

Change-Id: Ic76fce3f4316d640e165ec171d2f5ba6049b6c91
2020-04-16 18:11:15 +00:00
Maciej Zenczykowski
a11cf8fd7b Merge "remove dependency on ip6tables" into rvc-dev 2020-04-16 17:59:18 +00:00
Youkichi Hosoi
601bdc34a8 [automerger skipped] strings.mk: Allow empty RHS values for inputs of collapse-pairs am: cc39735e55 -s ours
am skip reason: Change-Id I35faeaedc3bc42e56e01201baf7ea6805a610439 with SHA-1 f6652f4f18 is in history

Change-Id: I5c85384801ada13064e764a904848a41a75f7966
2020-04-16 15:04:29 +00:00
Maciej Żenczykowski
364844c369 remove dependency on ip6tables
which is now (as of aosp master external/iptables @ HEAD, ie.
  https://android-review.googlesource.com/c/platform/external/iptables/+/1284244
) simply a symbolic link to iptables binary

This should fix:
  > FAILED:
  > build/make/core/main.mk:1132: warning:  build/make/target/product/generic.mk includes non-existent modules in PRODUCT_PACKAGES
  > Offending entries:
  > ip6tables
  > build/make/core/main.mk:1132: error: Build failed.

Test: No, but building, and treehugging
Bug: 154186169
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I94709a7450d0c41a64951c592b54de4b2956eae9
Merged-In: I94709a7450d0c41a64951c592b54de4b2956eae9
2020-04-16 13:54:51 +00:00
Martijn Coenen
7b9fef4a75 Rename ro.emulated_storage properties.
Whether these are enabled or not is independent of whether storage is
emulated or not; instead, use 'external_storage', and add the enabled
suffix as per property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Id893ce19025ded1ee1521081f7fc722dfee8e662
Merged-In: Id893ce19025ded1ee1521081f7fc722dfee8e662
2020-04-16 12:56:57 +00:00
Martijn Coenen
5afd62fb91 Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
These need to be a part of the vendor partition and be set even when
using GSI.

Bug: 152170470
Bug: 153525566
Test: android.drm.cts.DRMTest#testForwardLockAccess
Change-Id: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
Merged-In: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
2020-04-16 12:56:39 +00:00
Treehugger Robot
16a671ecbf Merge "remove dependency on ip6tables" am: 1bc7f6436b am: e3b2a9b081
Change-Id: I1b51a6f34985e24e82b6103b0601fb675cacbfeb
2020-04-16 10:45:16 +00:00
Treehugger Robot
e3b2a9b081 Merge "remove dependency on ip6tables" am: 1bc7f6436b
Change-Id: Ie283d9c83139861da94783d869fc3d9412d6dc01
2020-04-16 10:30:27 +00:00
Treehugger Robot
1bc7f6436b Merge "remove dependency on ip6tables" 2020-04-16 10:10:03 +00:00
Martijn Coenen
bd7284c7ed Merge changes from topic "emulated_storage_props" am: ecd9fde76f am: c5fa8e91e6
Change-Id: Ic48b1493ea478c45e905658f36438d01d0684be8
2020-04-16 08:35:13 +00:00
Martijn Coenen
51b7935d51 Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES. am: 178040341b am: 6fa31cc780
Change-Id: I2090038f6c860128adad689d2db0f707797cc9f6
2020-04-16 08:35:09 +00:00
Martijn Coenen
c5fa8e91e6 Merge changes from topic "emulated_storage_props" am: ecd9fde76f
Change-Id: I784b914edac7a94c5bf47a0b9814b4e3bae398e4
2020-04-16 08:21:04 +00:00
Martijn Coenen
6fa31cc780 Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES. am: 178040341b
Change-Id: I851e032ebc16e232553a8fbba4db4b9c3bc51e68
2020-04-16 08:21:00 +00:00
Maciej Żenczykowski
4cdfacae10 remove dependency on ip6tables
which is now (as of aosp master external/iptables @ HEAD, ie.
  https://android-review.googlesource.com/c/platform/external/iptables/+/1284244
) simply a symbolic link to iptables binary

This should fix:
  > FAILED:
  > build/make/core/main.mk:1132: warning:  build/make/target/product/generic.mk includes non-existent modules in PRODUCT_PACKAGES
  > Offending entries:
  > ip6tables
  > build/make/core/main.mk:1132: error: Build failed.

Test: No, but building, and treehugging
Bug: 154186169
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I94709a7450d0c41a64951c592b54de4b2956eae9
2020-04-16 01:11:10 -07:00
Martijn Coenen
ecd9fde76f Merge changes from topic "emulated_storage_props"
* changes:
  Rename ro.emulated_storage properties.
  Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
2020-04-16 08:06:52 +00:00
Youkichi Hosoi
cc39735e55 strings.mk: Allow empty RHS values for inputs of collapse-pairs
This CL is to make the function collapse-pairs(), which is applied to
lists of "property=value" pairs, allow empty properties (i.e. lines of
the form "empty.prop=").
Currently, the function only allows empty properties at the end (see
https://android-review.googlesource.com/c/platform/build/+/722908).
So empty properties in the middle result in broken property files (e.g.
"a=b c= d=e" is transformed to "a=b c=d=e", in which the property "c",
which originally has no value, is interpreted as having the value "d=e",
whereas the property "d", which originally has the value "e", is missing
from the resulting property file).
This CL revises the function so as to keep empty properties in the
middle as is (e.g. it returns "a=b c= d=e" for the above example), while
preserving the behavior for well-formed lists like "a=b c= d e = f".

Bug: 152379493
Test: make
Change-Id: I35faeaedc3bc42e56e01201baf7ea6805a610439
Merged-In: I35faeaedc3bc42e56e01201baf7ea6805a610439
(cherry picked from commit f6652f4f18)
2020-04-16 15:45:40 +09:00
Steve Muckle
10346271fd multi boot.img support cleanups
The kernel should not be specified in INTERNAL_RECOVERYIMAGE_ARGS, since
it is already given to mkbootimg directly.

The MKBOOTIMG_KERNEL_ARG macro is unused.

Bug: 151094943
Change-Id: Ie16a7bf7d77c0436d933abbb02c6dcb9202d5fe7
2020-04-15 14:32:39 -07:00
Treehugger Robot
b5db22810e Merge "strings.mk: Allow empty RHS values for inputs of collapse-pairs" am: 62d5978710 am: 4acb0e2577
Change-Id: Icada79251c4ed659a154b8886b4601566ebaf12c
2020-04-15 17:30:06 +00:00
Treehugger Robot
4acb0e2577 Merge "strings.mk: Allow empty RHS values for inputs of collapse-pairs" am: 62d5978710
Change-Id: Ib42301a1e2074ebfb317dec9b85563672d141962
2020-04-15 16:57:20 +00:00
Dan Shi
35b7c52980 [automerger skipped] Include shared host liraries in test suite zip am: 5e7b3f429d -s ours
am skip reason: Change-Id I7ebc4bf392d4c0f27478607846974631390097f8 with SHA-1 6a619b8d85 is in history

Change-Id: Id1e8bb3d8d9a2a8b86020f07389b7e7ce0e7254d
2020-04-15 16:44:29 +00:00
Martijn Coenen
c5ce32b19a Rename ro.emulated_storage properties.
Whether these are enabled or not is independent of whether storage is
emulated or not; instead, use 'external_storage', and add the enabled
suffix as per property naming guidelines.

Bug: 152170470
Bug: 153525566
Test: N/A
Change-Id: Id893ce19025ded1ee1521081f7fc722dfee8e662
2020-04-15 17:28:23 +02:00
Martijn Coenen
178040341b Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES.
These need to be a part of the vendor partition and be set even when
using GSI.

Bug: 152170470
Bug: 153525566
Test: android.drm.cts.DRMTest#testForwardLockAccess
Change-Id: I1e69d5c203d4f7480a6651ca780fbd307ce71c23
2020-04-15 14:21:34 +02:00
Dan Shi
5e7b3f429d Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
Merged-In: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-15 06:24:49 +00:00
Treehugger Robot
62d5978710 Merge "strings.mk: Allow empty RHS values for inputs of collapse-pairs" 2020-04-15 04:08:12 +00:00
TreeHugger Robot
cfe7b9e7f6 [automerger skipped] Merge "Enable non-v3 recovery image with v3 boot image" into rvc-dev am: ebd9e253ab -s ours
am skip reason: Change-Id I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf with SHA-1 f84668e1da is in history

Change-Id: I7860884c883e1055d129b08a25a7cde3a943788b
2020-04-15 01:33:34 +00:00
TreeHugger Robot
ebd9e253ab Merge "Enable non-v3 recovery image with v3 boot image" into rvc-dev 2020-04-15 01:12:29 +00:00
Dan Shi
00490906ad Merge "Include shared host liraries in test suite zip" am: 3c4326f32f am: 34ca4231d5
Change-Id: Ifeb0f611ca81ac13016f3372f4c0c435b2c5884c
2020-04-14 23:56:36 +00:00
Dan Shi
34ca4231d5 Merge "Include shared host liraries in test suite zip" am: 3c4326f32f
Change-Id: I234bf6c8e7b499a99693bbbbfcf785d8d12c20ed
2020-04-14 23:38:34 +00:00
Treehugger Robot
dbd9d4b3d0 Merge "Enable non-v3 recovery image with v3 boot image" am: 44bb05c328 am: 1c8e2eaf4a
Change-Id: Ic80192e5526e6b748a2a058a495613f14e3513b0
2020-04-14 23:13:25 +00:00
Dan Shi
3c4326f32f Merge "Include shared host liraries in test suite zip" 2020-04-14 23:10:51 +00:00
Treehugger Robot
1c8e2eaf4a Merge "Enable non-v3 recovery image with v3 boot image" am: 44bb05c328
Change-Id: I81f1492079b080642b1e3c4fa8ce7d34d180dbb2
2020-04-14 22:56:37 +00:00
Steve Muckle
759d0c8cb2 Enable non-v3 recovery image with v3 boot image
Add support for building a non-v3 recovery image along with a
v3 boot.img and vendor_boot image.

Bug: 150825361
Change-Id: I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf
Merged-In: I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf
2020-04-14 15:40:01 -07:00
Treehugger Robot
44bb05c328 Merge "Enable non-v3 recovery image with v3 boot image" 2020-04-14 22:37:28 +00:00
Steve Muckle
f84668e1da Enable non-v3 recovery image with v3 boot image
Add support for building a non-v3 recovery image along with a
v3 boot.img and vendor_boot image.

Bug: 150825361
Change-Id: I80d4e71ff09b83dd1c7f9accb4de99a30f95f4bf
2020-04-14 13:03:58 -07:00
Jooyung Han
960dfa2280 [automerger skipped] Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" am: 10644f1485 am: ecb1cbf481 -s ours
am skip reason: Change-Id I1e87206a7f261e587cf079cb6b7025ca16aa4fe4 with SHA-1 abe575d17b is in history

Change-Id: I4e4f619b10d2357545bf558d5f62e3e41dafa28f
2020-04-14 04:41:20 +00:00
Jooyung Han
ecb1cbf481 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" am: 10644f1485
Change-Id: I89ed97e7b3c6755c3620173cc05dd3f53bcb1d76
2020-04-14 04:21:42 +00:00
Jooyung Han
10644f1485 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" 2020-04-14 04:00:03 +00:00
Jiyong Park
0b3d8ccc00 [automerger skipped] Merge "libselinux is LLNDK, not VNDK-core" into rvc-dev am: 198e9ae373 -s ours
am skip reason: Change-Id I7106ac236770b55b147c8a7f524bc2eddbddedb1 with SHA-1 0b7b97bfc3 is in history

Change-Id: Ic0e9395c9c33eaca4159369bc11cce010f99a1b1
2020-04-14 02:41:07 +00:00