Commit Graph

51017 Commits

Author SHA1 Message Date
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
Kiyoung Kim 049d535910 Add libraries txt file to build target
Linkerconfig requires more libraries txt files to get library list
related variable values. To make this available from runtime, those
should be added as build target and included in system image.

Bug: 137511540
Test: m -j && tested from cuttlefish
Change-Id: I713c4419e4ed52e22561a5988f6c233ecce91c9d
2019-07-23 19:54:53 +09:00
Treehugger Robot 5f42d56a24 Merge "Inject boot patch level into boot-debug.img" 2019-07-23 06:40:58 +00:00
Hsin-Yi Chen 07ece13f06 Ensure no redundant ABI reference dumps
This commit ensures that all ABI dumps under prebuilts/abi-dumps/ have
corresponding NDK/VNDK libraries. When an NDK/VNDK library is removed
but its ABI dump isn't, the build system reports an error.

The build system does not check whether all NDK/VNDK libraries have ABI
reference dumps because the owners of the libraries may intend to
disable ABI check in some cases.

Test: touch prebuilts/abi-dumps/vndk/R/32/x86/test.so.lsdump && make
Bug: 132140703
Change-Id: I615ac8b509f151b75f57f35cd78c518fae798974
2019-07-23 14:20:21 +08:00
Steven Moreland ef85b4c4d4 Add libbinder_ndk to ll-ndk.
So that it is always in sync w/ system libbinder.

Bug: 136027762
Bug: 138152918
Test: binderVendorDoubleLoadTest
Change-Id: I46f896ee979d41ed67ac47b7c84652b4b49aa8c9
2019-07-23 01:28:32 +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
Steven Moreland 34f1c35a60 Remove libhidlcache
This is unused, and there are plans in the future
to use fwk IMemory everywhere.

Bug: 136027762
Test: N/A
Change-Id: I5f2eb40542d3127c08e4f74caa6adb3cd2bfbac1
2019-07-22 10:46:07 -07: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
Treehugger Robot 97f75df31c Merge "Add default LMK properties to GSI" 2019-07-19 23:06:11 +00: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
Tao Bao 7c9ea2b881 Merge "Removed an obsolete TODO." 2019-07-19 13:48:31 +00:00
Elliott Hughes 2e6e73bb01 Remove unused BoardConfig variables.
Determined via codesearch.

Test: treehugger
Change-Id: I5138e1b2294d39e11b46f9e1751c41b842c1743b
2019-07-18 21:43:38 -07:00
Daniel Norman ff165e31fd Merge "Clean up merge_target_files.py." 2019-07-19 03:15:29 +00: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
Daniel Norman 4cc9df660b Clean up merge_target_files.py.
- Removes functions that can be replaced with one-line external methods
- Moves read_config_list to common alongside similar methods LoadDictionaryFrom*
- Runs pyformat on merge_target_files.py

Bug: 137853921
Test: python -m unittest test_merge_target_files
Test: Using merge_target_files.py to create a merged build, & booting.
Change-Id: I833c1086db41e1374057cc7447fc50d1915734a7
2019-07-18 13:04:54 -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
Treehugger Robot a627e9056b Merge "Remove perfprofd reference." 2019-07-18 17:22:43 +00: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
Tao Bao e733ed7e6b Merge "logging: set stdout and stderr to None in some cases" 2019-07-17 15:40:59 +00:00
Elliott Hughes 36d86c1670 Remove perfprofd reference.
Dead and gone.

Test: treehugger
Change-Id: I8575fd9efaa371d61fac5204ee4d982e985a9a56
2019-07-17 08:16:29 -07: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
Tianjie Xu dcb6644719 Merge "Factor out the image classes to break circular dependency" 2019-07-16 20:09:50 +00:00
Ryan Prichard 0f998368bb Merge "envsetup: avoid adding "::" (the cwd) to the PATH" 2019-07-16 20:04:15 +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
SzuWei Lin b3e9fc2219 Add default LMK properties to GSI
These LMK properties are product properties. The configuration will
be absent when GSI is installed as GSI doesn't mount the product
partition. Without these settings, some CTS test cases could
fail due to an aggressive LMK.

The patch puts these properties in GSI as default values.

Bug: 136212765
Bug: 134460917
Test: `run cts -m CtsFileSystemTestCases`, all pass
Change-Id: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
Merged-In: I6fde8db51debcb9bb269aece3a3e4c7e5bb991f6
(cherry picked from commit 9547929af4)
2019-07-16 16:53:12 +08:00
Ryan Prichard 8426a19969 envsetup: avoid adding "::" (the cwd) to the PATH
Fix this error:

    rprichard@cashew:/x/aosp/out/target/product/walleye/system/bin$ ls
    bash: ./ls: cannot execute binary file: Exec format error

Bug: none
Test: lunch a target, "echo $PATH | grep ::"
Test: lunch an arm target, cd $OUT/system/bin, ls (
Change-Id: I2c0d5ece85964dffa14d6ac8df168dd4e733162e
2019-07-15 18:16:35 -07:00
Tianjie Xu 41976c725c Factor out the image classes to break circular dependency
This helps to break the circular dependency between common and
blockimgdiff.

Bug: 32379627
Test: unit tests pass
Change-Id: I90b5ff34782acbfac86f36265bd96c207d898bf6
2019-07-15 17:02:23 -07:00
Treehugger Robot 2b4828a564 Merge "Catch unicode decode errors search for kernel ver" 2019-07-15 18:33:57 +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