Commit Graph

19331 Commits

Author SHA1 Message Date
Pirama Arumuga Nainar
bf2af95f73 Explicitly add lld's relr relocation flags for Android Pie and above
Bug: http://b/119086751

https://android-review.googlesource.com/c/837025 disabled lld relocation
packing globally and enabled it for soong modules targeting pie and
above.  Turn it on for Android.mk modules as well.

Test: grep for -Wl,pack-dyn-relocs=android in
      out/build-aosp_<device>.ninja

Change-Id: I81b8625073aa6b364219b8cf3122b69c95ec7589
2019-07-30 22:36:29 -07:00
Dan Willemsen
d69e849c9b Merge "Stop supporting wrapping the build with make" 2019-07-30 21:48:52 +00:00
Chris Gross
bb039794d6 Merge "Include extra licenses in vendor image NOTICE file" 2019-07-30 19:01:02 +00:00
Dan Willemsen
a2d19cfd05 Merge "Remove the PRODUCT-* goal" 2019-07-30 17:04:07 +00:00
Evgeny Eltsin
2cd7eaaf13 Merge "Add native bridge abis to corresponding abilists" 2019-07-30 11:36:27 +00:00
Dan Willemsen
893948955d Stop supporting wrapping the build with make
The build servers are no longer using this. It's hard to search for
others using it -- I've cleaned them up as I've run across them, but
we'll just have to see who breaks once this goes in.

This was the last user of makeparallel, so we can remove it.

Test: make
Test: treehugger
Change-Id: If6df3f1a67d6a6df36afaa4b07cd88a48a364fe1
2019-07-29 22:43:35 -07:00
Peter Collingbourne
58df13daa0 Merge "Specify the API level via the triple instead of __ANDROID_API__." 2019-07-30 01:23:04 +00:00
Dan Willemsen
8a5d597bbf Remove the PRODUCT-* goal
I've switched all the build server configs to using TARGET_PRODUCT /
TARGET_BUILD_VARIANT and explicit goals instead.

Remove tools/check_builds.sh which relied on this, but hasn't been
touched in a long time.

Test: m PRODUCT-test
Test: treehugger
Change-Id: If5f8c714567b33aeb38223c176ca24ea649eb57d
2019-07-29 14:27:04 -07:00
Treehugger Robot
6f8e3da035 Merge "Remove the APP-* goal" 2019-07-29 16:30:52 +00:00
Evgeny Eltsin
28fbe7f9e9 Add native bridge abis to corresponding abilists
This uses TARGET_NATIVE_BRIDGE_*_ABI variable to automatically generate
abi lists.

Sample properties for x86+arm:
ro.product.cpu.abilist=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist32=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist64=

Sample properties for x86_64+arm64:
ro.product.cpu.abilist=x86_64,x86,arm64-v8a,armeabi-v7a,armeabi
ro.product.cpu.abilist32=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist64=x86_64,arm64-v8a

Bug: http://b/77159578
Bug: http://b/28684022
Test: make cf_x86_64_phone, deploys, check adb shell getprop | grep abi
Change-Id: I42a73f5c627b9d9f44e31cc5ad84238e1050f52a
2019-07-29 16:23:32 +02:00
Treehugger Robot
5da40edef0 Merge "fix: set built_module in misc_prebuilt_internal.mk" 2019-07-26 01:22:23 +00:00
Dan Willemsen
01ab167a20 Remove the APP-* goal
I can't find anything still using this, and I'm close to removing the
PRODUCT-* goal.

Test: codesearch (both android and the build configs)
Test: m APP-test
Change-Id: I4efdcdea2bb9ace14632cab35a2a1c7bdc89592f
2019-07-25 17:59:07 -07:00
Peter Collingbourne
e3606ae651 Specify the API level via the triple instead of __ANDROID_API__.
Clang derives the value of __ANDROID_API__ from the triple these days. In a
future version of clang I plan to start making the behaviour of the HWASAN pass
dependent on the API level in the triple, so it's going to need to be accurate.

Test: walleye-userdebug boots
Change-Id: I23f570bd8ee4fb3167729a75a5e859efe1883a46
2019-07-25 17:43:04 -07:00
Chris Gross
aad39b3281 Include extra licenses in vendor image NOTICE file
If building with a vendor image, ensure that the licenses from
extra partitions are included in the vendor NOTICE file (possibly in
addition to having them in the system NOTICE file) since they could come
from disperate source trees. This change does not affect existing NOTICE
files outside of the system partition. (e.g. product and system_ext).

Bug: 134679603
Test: Built a vendor image enabled target and ensured the notices were in the
proper file
Change-Id: Ib17c7d7f84805734de09e686a4835b9b680b4192
2019-07-25 16:10:05 -07:00
Przemyslaw Szczepaniak
b4befed86f Merge "Move libneuralnetworks.so to com.android.neuralnetworks APEX" 2019-07-24 09:12:18 +00:00
Tom Cherry
6722de1277 Merge "Generate /etc/{passwd,group} for all partitions" 2019-07-23 16:40:01 +00:00
Ramy Medhat
f7eb2f829c Merge "Add RBE mk file to support bootstrapping RBE and setting relevant environment variables." 2019-07-23 11:49:10 +00:00
Treehugger Robot
5f42d56a24 Merge "Inject boot patch level into boot-debug.img" 2019-07-23 06:40:58 +00:00
Tom Cherry
fb303a5903 Generate /etc/{passwd,group} for all partitions
Bug: 73062966
Test: can load AIDs from partitions other than vendor
Test: bionic-unit-tests
Merged-In: Ia85abbeefe5a945369970f2aef42692e07ab8c09
Change-Id: Ia85abbeefe5a945369970f2aef42692e07ab8c09
2019-07-22 21:41:17 +00:00
Dan Albert
bf07f0085b Merge "Cleanup ASan build implementation." 2019-07-22 18:05:10 +00:00
Chris Gross
79da9010d5 Merge "Create ODM partition NOTICE file" 2019-07-22 16:32:40 +00:00
Elliott Hughes
56bcff99a4 Merge "Remove unused BoardConfig variables." 2019-07-22 15:41:21 +00:00
Pangyen Chen
b994524ea6 Inject boot patch level into boot-debug.img
When /boot partition is AVB chained, boot patch level will be
included into the AVB metadata appended to boot.img. We should
also do the same for boot-debug.img to pass keymaster v4 VTS
tests, whichs checks per-partition security patch levels are
indicated in AVB properties.

Bug: 136980825
Test: avbtool info_image --image $OUT/boot-debug.img, checks
      com.android.build.boot.security_patch is there

Change-Id: I2ea1ebfa6abbbbc95639817c208a90642fc3d068
2019-07-22 18:04:03 +08:00
Jooyung Han
0fbfb4bd57 fix: set built_module in misc_prebuilt_internal.mk
*_prebuilt_internal.mk should set "built_module" with LOCAL_BUILT_MODULE
on success, since it is used to set dependency between built module and
additional dependencies (LOCAL_ADDITIONAL_DEPENDENCIES).

In aosp/970424, it didn't set it properly.

As a consequence, setting additional dependencies to a built module was
wrong for various classes of modules(ETC, SCRIPT, DATA)

For example, prebuilt_etc_xml module(com.google.vr.platform.xml) has
an additional depdendency(timestamp of xmllint). But the dependency is
set to unexected module(com.android.support.apexer.soong_zip).
This is because that
1) built_module is not set in misc_prebuilt_internal.mk
2) built_module is not reset after use and soong_zip was last module
which set built_module variable.

Bug: 132925121
Test: m com.google.vr.platform.xml && check build-<TARGET>.ninja to see
if there is additional dependency as described above

Change-Id: I74fdf6b6ad583f3c08dc0b8fc8595d7ef9cc7306
2019-07-22 15:31:55 +09:00
Dan Albert
a0530aa94d Cleanup ASan build implementation.
We already link the shared prebuilt from the toolchain. This is
redundant and the wrong version.

Test: make checkbuild
Bug: http://b/74067984
Change-Id: Ie315b7fd8195414717d3fbe6dad1f12577ef3e35
2019-07-19 12:53:00 -07:00
Przemyslaw Szczepaniak
f67c72b34d Move libneuralnetworks.so to com.android.neuralnetworks APEX
Test: build&flashed crosshatch image
Bug: 137320025

Change-Id: Iadbb32cffc636c515a5e89b62539183ebc0c2f14
2019-07-19 16:41:48 +01:00
Elliott Hughes
2e6e73bb01 Remove unused BoardConfig variables.
Determined via codesearch.

Test: treehugger
Change-Id: I5138e1b2294d39e11b46f9e1751c41b842c1743b
2019-07-18 21:43:38 -07:00
Tao Bao
301c6f471b Removed an obsolete TODO.
The intended check was to ensure system image won't be built as a
chained partition when using dynamic partitions. Because such an image
can't be verified by bootloader.

As it evolves, GSI system image has been built against the intended
check. Because GSI system image will be verified by first stage init in
userspace.

Bug: 80195851
Test: TreeHugger
Change-Id: I45b079799e5d7443e82d73d43e2b63c613f33165
2019-07-18 15:46:31 -07:00
Tao Bao
25cf50f582 Merge "Build build_image and build_super_image as modules." 2019-07-18 21:18:01 +00:00
Chris Gross
15d9655906 Create ODM partition NOTICE file
Logic to create a seperate ODM NOTICE file for modules located at
TARGET_OUT_ODM.

Bug: 137542307
Test: Built an image with both a seperate ODM image and one where it is
built into vendor.img and ensured that a NOTICE.xml.gz was located at
/odm/etc and contained any license generated by ODM modules.

Change-Id: I9e6f46b1b94c5b6584c2a5810713fcf49f637d02
2019-07-18 14:00:43 -07:00
Treehugger Robot
02e116ce58 Merge "Make the error messages from the two APEX_MODULE_LIBS checks easier to tell apart." 2019-07-18 19:21:41 +00:00
Tao Bao
2bbb07c53c Build build_image and build_super_image as modules.
Bug: 63866463
Test: TreeHugger
Test: `atest releasetools_test`
Test: `atest releasetools_py3_test`
Change-Id: I2059a4ced709d1b2ee331a9aaaa5ca30db4ebf6b
2019-07-18 10:27:38 -07:00
Isaac Chen
34e90798e5 Merge "Include tools/files for GSI artifacts" 2019-07-18 06:23:34 +00:00
Jeffrey Vander Stoep
972695d81d Merge "Renderscript: change extension .rs to .rscript" 2019-07-18 02:02:00 +00:00
Daniel Norman
b74fa6cf97 Merge "Writes misc_info.txt in o/t/p without requiring 'm dist'." 2019-07-18 01:00:09 +00:00
Daniel Norman
e1e4808d57 Writes misc_info.txt in o/t/p without requiring 'm dist'.
Bug: 137291090
Test: `m misc_info`, diff with META/misc_info.txt from an old `m dist` build.
Change-Id: I9bb99d3418c91a64f7d585b4a4d6a17f540c7328
2019-07-17 14:13:27 -07:00
Jeff Vander Stoep
c44aa3be41 Renderscript: change extension .rs to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Change-Id: Ibfccb4f52b74f9ac95c373f48d775254ba77288d
Merged-In: Ibfccb4f52b74f9ac95c373f48d775254ba77288d
2019-07-17 18:57:49 +00:00
Ramy Medhat
ec8b8dfa3e Add RBE mk file to support bootstrapping RBE and setting relevant
environment variables.

Test: Built aosp_arm-user with and without USE_RBE. With USE_RBE,
used a simple proxy script in place of rewrapper.

Change-Id: Ifb6bfd9f7292346f4750a6a409aa0def4e3c0363
2019-07-17 14:22:00 +00:00
Isaac Chen
9e09d47df8 Include tools/files for GSI artifacts
Tools/files added in this CL are necessary for mixing GSI with vendor
images from other product and for the GSI to run on the emulator.

Bug: 136786169
Test: $ lunch aosp_x86-userdebug
      $ m -j updatepackage otatools-package emu_extra_imgs
      $ cd $TMP_DIR
      $ unzip $OUT/emu-extra-linux-system-images-eng.ycchen.zip
      $ cd x86
      $ unzip -n $OUT/aosp_x86-img-eng.ycchen.zip
      $ unzip $OUT/otatools bin/mk_combined_img bin/sgdisk
      $ unzip $OUT/otatools lib64/libc++.so lib64/libext2_uuid-host.so
      $ cut -d/ -f5 system-qemu-config.txt > composit.txt
      $ SGDISK=bin/sgdisk bin/mk_combined_img -i composit.txt -o system.img
      $ cd ..
      # Download sdk-repo-linux-emulator-*.zip from AB
      $ unzip -l sdk-repo-linux-emulator-*.zip
      $ ANDROID_PRODUCT_OUT=x86 ANDROID_BUILD_TOP=x86 emulator/emulator

Change-Id: Ibf88652eb4fb3244553062bbfb8bceac9a5cda47
2019-07-17 18:06:31 +08:00
Colin Cross
cea6dcd135 Merge "Don't escape BuildNumberFromFile" 2019-07-17 02:45:02 +00:00
Colin Cross
91b78978fd Don't escape BuildNumberFromFile
Change BuildNumberFromFile to be unescaped.  This will allow passing
ctx.Config().BuildNumberFromFile() to RuleBuilder, which will handle
the necessary escaping.

Test: no change to out/soong/build.ninja
Change-Id: Iab8df0ecf08d7078093c89a994382eab394117a5
2019-07-16 10:21:41 -07:00
Martin Stjernholm
1886f53103 Make the error messages from the two APEX_MODULE_LIBS checks easier to tell
apart.

Also make it more clear what the problem may be when the "find" check fails,
to aid troubleshooting.

Test: m
Change-Id: Iacdc4734f20eeaf3fb0d29e418df21f5089cecbc
2019-07-16 17:47:33 +01:00
Dimitry Ivanov
9c7ab5944e Merge "Add NativeBridgeRelativePath config variables" 2019-07-16 09:17:35 +00:00
Tianjie Xu
f70815cbd2 Merge "Add update_host_simulator to otatools" 2019-07-15 18:00:16 +00:00
Logan Chien
1277b8cca1 Merge changes Ia0410da8,Id756340f
* changes:
  Strip my_shared_libraries to remove space char
  Move cxx_stl_setup.mk out of ifdef
2019-07-13 20:56:04 +00:00
Treehugger Robot
10115f54b9 Merge "install modules.softdep from depmod output" 2019-07-12 22:20:22 +00:00
Daniel Norman
858fa08427 Merge "Changes host_init_verifier to use hidl interface inheritance hierarchy." 2019-07-12 18:01:46 +00:00
Logan Chien
e984ebbb57 Strip my_shared_libraries to remove space char
This commit strips my_shared_libraries to remove the unwanted space
character when both `$(filter-out ...)` and
`$(my_system_shared_libraries)` are empty.

Bug: 137302468
Test: lunch aosp_walleye-userdebug && make
Test: lunch aosp_walleye-userdebug && make check-elf-files
Change-Id: Ia0410da877196c104a61d48c92a2be969a9754a5
2019-07-12 10:26:50 -07:00
Logan Chien
a45d6f5ee9 Move cxx_stl_setup.mk out of ifdef
This commit moves `include cxx_stl_setup.mk` out of `ifdef
my_shared_libraries` so that it can always get a chance to tweak
my_shared_libraries.

Bug: 137302468
Test: lunch aosp_walleye-userdebug && make
Test: lunch aosp_walleye-userdebug && make check-elf-files
Change-Id: Id756340f0a62d7ac06d301c3260430a1af74ed89
2019-07-12 10:26:50 -07:00
Elliott Hughes
9a4b84de56 Merge "Stop building unnecessary tarballs." 2019-07-12 14:52:53 +00:00