Commit graph

58123 commits

Author SHA1 Message Date
Dan Willemsen
efee0692d4 Obsolete unused module types
These were deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is identical
Test: treehugger
Change-Id: I6286880e45c0facbae56f9a16e8cfcbde12f121c
2020-04-18 21:00:18 -07:00
Dan Willemsen
58634e1482 Remove AUX support
This was deprecated in R, which has now branched, and there aren't any
users on master.

Test: build-aosp_crosshatch.ninja is the same (except for the removal of the empty auxiliary target)
Test: treehugger
Change-Id: I306156ab7f91cd4a2258554b4215766c99cd12d1
2020-04-18 21:00:18 -07:00
Anton Hansson
c94417e9a7 Merge "Remove _API_FILE variables" 2020-04-18 09:13:49 +00:00
Treehugger Robot
2162d25b8f Merge "Add fsverity release cert" 2020-04-18 02:17:20 +00:00
Kousik Kumar
1d56417af0 Merge "Use soong_zip instead of jar to generate .jar files in javac actions" 2020-04-17 21:51:31 +00:00
Anton Hansson
ac1887227d Remove _API_FILE variables
There are no known usages of these variables, and they've been
incorrectly set for a long time.

The phony for $(LOCAL_MODULE) in droiddoc to build the api txt
has been moved to soong.

Bug: 152479829
Test: m
Change-Id: I31742e50d1af42fb899c7a3436af5647bd90cc47
2020-04-17 20:27:41 +01:00
Victor Hsieh
d24991a26e Add fsverity release cert
The release cert helps verifying CTS in a release build.

Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
2020-04-17 10:27:42 -07:00
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
2cbcf3bda2 Merge "Check ELF prebuilts in PRODUCT_COPY_FILES" 2020-04-17 01:06:32 +00:00
Treehugger Robot
cffe5615f6 Merge "multi boot.img support cleanups" 2020-04-16 23:22:52 +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
Treehugger Robot
1bc7f6436b Merge "remove dependency on ip6tables" 2020-04-16 10:10:03 +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
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
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
Treehugger Robot
62d5978710 Merge "strings.mk: Allow empty RHS values for inputs of collapse-pairs" 2020-04-15 04:08:12 +00:00
Dan Shi
3c4326f32f Merge "Include shared host liraries in test suite zip" 2020-04-14 23:10:51 +00: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
10644f1485 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" 2020-04-14 04:00:03 +00:00
Jooyung Han
7fcd3b36ee Remove PLATFORM_VERSION_FUTURE_CODENAMES
It has been wrong to split ALL_VERSIONS into exclusive two sets of
before/after TARGET_PLATFORM_VERSION.

And PLATFORM_VERSION_ALL_CODENAMES supports all *active* list of
non-finalized codenames.

Bug: 152960049
Test: m
Merged-In: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
(cherry picked from commit abe575d17b)

Exempt-From-Owner-Approval: cp from master
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
2020-04-14 02:06:19 +00:00
Treehugger Robot
8266acdb9d Merge "Don't install test suite files from uninstallable modules" 2020-04-14 00:26:00 +00:00
Treehugger Robot
f50a23e684 Merge "Update refreshmod docs." 2020-04-13 19:58:16 +00:00
Colin Cross
fca369e4e3 Don't install test suite files from uninstallable modules
Don't copy tests or test data to the test suite directories if the
module is marked LOCAL_UNINSTALLABLE_MODULE := true.

Fixes: 153758132
Test: m checkbuild
Change-Id: Ibdf18807a2ffe9bb352d74880a802ad55b57f154
2020-04-13 12:21:44 -07:00
Dan Shi
6a619b8d85 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
2020-04-13 09:29:16 -07:00
Treehugger Robot
083b9e9daa Merge "libselinux is LLNDK, not VNDK-core" 2020-04-13 04:05:31 +00:00
Steven Moreland
ab25c7a30f Update refreshmod docs.
This also affects pathmod here.

Since it's updating module-info.json, we could say that as well (this
should affect any tools which parse this file), but I haven't seen any
indication it's necessary in this context.

Bug: N/A
Test: N/A
Change-Id: Iecb6f454112b5c0095ee7063bc5442fdb1e3bd09
2020-04-09 12:05:34 -07:00
Paul Duffin
388f1a4596 Merge "Add phony module for droidstubs even if srcjar is not created" 2020-04-09 15:42:07 +00:00
Colin Cross
65ca0eec96 Merge "Revert "Revert "Use sdk variant of Soong modules when LOCAL_SDK_..."" 2020-04-08 18:29:30 +00:00
Paul Duffin
e9e7247749 Add phony module for droidstubs even if srcjar is not created
This makes it possible to build the .txt file by using the module name
rather than using its path.

Bug: 146727827
Test: m framework-sdkextensions-api-module_libs_api
Change-Id: I8ccbdfeedc0f418d95a79b01e4724837d9dcd6ca
2020-04-08 18:49:22 +01:00
Roland Levillain
4f5f316a5b Merge "Print a user-friendly message when lunch cannot use the default product." 2020-04-08 15:41:11 +00:00
Roland Levillain
23c46cf424 Print a user-friendly message when lunch cannot use the default product.
In some environments (e.g. with the master-art branch), the default
product (aosp_arm-eng) cannot be built, and thus prevents `lunch` from
printing the lunch menu (as it cannot initialize the build system in
order to fetch the common lunch choices). When this happens, show an
explicit error message from `lunch` instead of a Soong UI error.

Test: Check that this command line displays the expected error message:
        unset TARGET_PRODUCT && . build/envsetup.sh && lunch
Bug: 152762648
Change-Id: I40c66bca5b075d88dbc8364b36b2db713e6ad93e
2020-04-08 13:09:49 +01:00
Yo Chiang
0b49c03727 Check ELF prebuilts in PRODUCT_COPY_FILES
Add a check to ban ELF prebuilts in PRODUCT_COPY_FILES.
ELF prebuilts should be defined properly by cc_prebuilt_library_shared
and cc_prebuilt_binary so that the build system can keep track of the
file dependencies.

To opt in this check, set this option in BoardConfig.mk:
  BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := false

After all devices that have ELF prebuilts in PRODUCT_COPY_FILES are
tagged with BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true flip
BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES to default false.

After a device is cleaned up, remove its
BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true setting.

Bug: 140560012
Test: Set BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := false
Test: m # Should report any ELF prebuilt error in PRODUCT_COPY_FILES
Change-Id: Id75dac9417aed9baa7c5e9388430ff9369cf9b4f
2020-04-08 18:01:24 +08:00
Xin Li
d95545fc81 Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" 2020-04-08 06:26:03 +00:00
Xin Li
4e8f40a307 DO NOT MERGE - Merge QQ2A.200405.005 into master
Bug: 150877681
Change-Id: I5e36c453de41b16cf722454edb21428cfd3b759c
Merged-In: Ic383f938d12f9fac0d93364ba737f0c401fb0a01
Merged-In: I4e5b07e96a1ddc23057b373a1ff7d9f54ae361bb
2020-04-08 03:39:21 +00:00
Jaewoong Jung
e57fb1a3aa Merge "Add signing certificate lineage file support." 2020-04-07 22:33:25 +00:00
Colin Cross
e0c5e44360 Revert "Revert "Use sdk variant of Soong modules when LOCAL_SDK_..."
Revert^2 "Add sdk mutator for native modules"

f8e80229fedb47302e9cfd32990859a6308020cf

Change-Id: Ib686b52339ae5031434a2fb6a0e7f5b0c0dc5641
2020-04-07 16:50:32 +00:00
Vladimir Marko
385c9ae90f Merge "Pass /system/etc/updatable-bcp-packages.txt to dex2oat." 2020-04-07 07:34:14 +00:00
Treehugger Robot
ddeddc819d Merge "Fix signing on some GSI targets" 2020-04-07 04:33:19 +00:00
Colin Cross
189a925c8b Merge "Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..."" 2020-04-07 04:25:34 +00:00
Colin Cross
79e5a55122 Revert "Use sdk variant of Soong modules when LOCAL_SDK_VERSION ..."
Revert "Add sdk mutator for native modules"

Revert submission 1242911-sdk_version_variant

Reason for revert: b/153394225
Reverted Changes:
Ife99745fb:Use libnativewindow for platform variant of libagq...
I1bae84c43:Use libnativewindow for platform variant of androi...
I6e6021ed3:Use stl to depend on libc++
Ife99745fb:Use libnativewindow for platform variant of libRSS...
I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk
Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi...
I7d72934aa:Add sdk mutator for native modules
Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE...

Bug: 149591340
Change-Id: I6cd4de221ece29e48d58a8b1297dc2512b2dad13
Fixes: 153394225
2020-04-07 04:21:21 +00:00
Colin Cross
a2af96b642 Merge "Use sdk variant of Soong modules when LOCAL_SDK_VERSION is set" 2020-04-07 01:52:10 +00:00
Jaewoong Jung
95445e6913 Add signing certificate lineage file support.
Also add multi-cert support to prebuilt apps so that they can benefit
from the new lineage feature.

(This is a cherry-pick change.)

Test: m GoogleServicesFramework w/ modified build rules
Test: m PrebuiltGmsCore w/ modified build rules
Test: apksigner lineage -v --print-certs -in <built_module_path>
Fixes: 152897457
Change-Id: If7d5d4bd308629c8340231520214c76c8a568a65
Merged-In: If7d5d4bd308629c8340231520214c76c8a568a65
2020-04-06 13:42:23 -07:00
Zhen Zhang
760e3768bb Merge "emulator: fix full-eng build on aosp" 2020-04-06 20:06:15 +00:00
bohu
0f9c766320 emulator: fix full-eng build on aosp
BUG: 153361966
Test: Build full-eng
Change-Id: I0e8f065cf875d19be705430c642922f2c9a39d76
2020-04-06 20:01:24 +00:00
Bo Hu
ac74429171 Merge "emulator: enable vendor boot image" 2020-04-06 19:18:13 +00:00
Bill Peckham
f6baf822ac Merge "Ensure that merge_target_files.py prints INFO level logs." 2020-04-06 19:00:56 +00:00