Commit graph

50771 commits

Author SHA1 Message Date
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
Dimitry Ivanov
9c7ab5944e Merge "Add NativeBridgeRelativePath config variables" 2019-07-16 09:17:35 +00: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
Elliott Hughes
9a4b84de56 Merge "Stop building unnecessary tarballs." 2019-07-12 14:52:53 +00:00
Tao Bao
d077c5b88e Merge "releasetools: Ignore nonexistent APEX overrides." 2019-07-12 14:42:37 +00:00
dimitry
fb2449f7b7 Add NativeBridgeRelativePath config variables
This will allow us to unhardcode relative paths for native-bridge
binaries in soong.

Test: make PRODUCT-cf_x86_phone-userdebug
Change-Id: I72b33ee610c92d41e1370fcaa1512529c5d7c88c
2019-07-12 16:08:00 +02:00
Tao Bao
3422309d6d releasetools: Ignore nonexistent APEX overrides.
This allows sharing the same signing config on different target_files
zips. Nonexistent APEX will be ignored with a warning.

Bug: 137249701
Test: Run sign_target_files_apks with APEX overrides.
Change-Id: I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c
Merged-In: I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c
(cherry picked from commit b369c7226a)
2019-07-12 00:25:41 -07:00
Elliott Hughes
440c99f1f2 Stop building unnecessary tarballs.
Test: treehugger
Change-Id: Iaba2aa6d09ad891f37171cc76778d08c78c78f93
2019-07-12 05:04:12 +00:00
Treehugger Robot
3f7c416650 Merge "add BOARD_VENDOR_RAMDISK_KERNEL_MODULES[_LOAD]" 2019-07-12 04:14:36 +00:00
Steve Muckle
0f7bb1b84b install modules.softdep from depmod output
The modules.softdep file is used to communicate soft dependencies
between modules and is supported by libmodprobe.

Bug: 130585369
Change-Id: I790ea872fde7fb0cb58e07277a32aa4688adcac6
2019-07-11 17:50:05 -07:00
Steve Muckle
69280d22e6 add BOARD_VENDOR_RAMDISK_KERNEL_MODULES[_LOAD]
To accommodate a future vendor ramdisk, recognize
BOARD_VENDOR_RAMDISK_KERNEL_MODULES and
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD as a way to specify kernel
modules to be stored on the vendor ramdisk, and the optional override list of
kernel modules to be loaded by first stage init.

For now this will affect the modules loaded on the generic ramdisk,
but will provide a way for vendors to add support now and hopefully not
have to modify it later when the vendor ramdisk is created.

BOARD_RAMDISK_KERNEL_MODULES is renamed to
BOARD_GENERIC_RAMDISK_KERNEL_MODULES, which is not expected to be
modified by vendors.

Bug: 137297791
Change-Id: I05944e004ab5235172da3a15b8d1c6f4c4c021ce
2019-07-11 23:53:36 +00:00
Treehugger Robot
f90ec83802 Merge "Implement range-based pin list" 2019-07-11 22:21:03 +00:00
Treehugger Robot
8eec867605 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 2019-07-11 18:33:34 +00:00
Tao Bao
6623fdda5a Merge "releasetools: Replace iteritems with items." 2019-07-11 18:07:19 +00:00
Paul Duffin
831197ee31 Merge "Remove direct dependency on art/tools/veridex/appcompat.sh" 2019-07-11 14:52:10 +00:00
Paul Duffin
c319fdb65a Remove direct dependency on art/tools/veridex/appcompat.sh
The dependency causes a build breakage when unbundling the runtime
module, i.e. when the art repository is not present in the local build
tree.

Bug: 134379140
Test: m droid
Change-Id: Ia3f9b60dbe3e9cf00ea13ae7bdc74bdd386b4362
2019-07-11 12:24:54 +01:00
Tao Bao
3888428f29 releasetools: Replace iteritems with items.
While in theory this could incur memory overhead for Python 2, the
impact is low for the existing use cases (plus we're moving away from
Python 2).

Bug: 131631303
Test: No additional occurrence of iteritems.
Test: Build with Python 3.
Change-Id: I0205c9edf25f46e3d85967c7dd2c1af035757741
2019-07-10 22:29:20 -07:00
Tao Bao
576ae9628b Merge "Additionally run releasetools_test with Python 3." 2019-07-10 18:22:37 +00:00
Treehugger Robot
0bf9b427b6 Merge "Whitelist dexpreopt files for SdkSetup" 2019-07-10 07:28:37 +00:00
SzuWei Lin
d2a6aa8525 Whitelist dexpreopt files for SdkSetup
aosp_product.mk removed the wildcard dexpreopt items. Any apk
requires to whitelist them also.

Bug: 135502030
Test: build aosp_arm-userdebug
Change-Id: Ibb1e6bfe6136a2e63f92e0305b3b939f08127428
2019-07-10 12:28:13 +08:00
Treehugger Robot
4899beb4bf Merge "Revise GSI targets to inherit from mainline_system directly" 2019-07-10 03:49:27 +00:00
Daniel Norman
bfdf765f97 Changes host_init_verifier to use hidl interface inheritance hierarchy.
Bug: 118016875
Test: Added 'interface' lines to an init_rc file and observed errors
when misspelled or missing entire inheritance hierarchy.
Change-Id: I71d515e0c12ed74800b9536f07da9fc7bb69597e
2019-07-09 20:18:49 +00:00
Sam Saccone
cd7eb25a33 Merge "Revert "this is the subject"" 2019-07-09 19:02:51 +00:00
Sam Saccone
f722f36079 Revert "this is the subject"
This reverts commit 4091a00e39.

Reason for revert: bad submit

Change-Id: I4808614f2b399a086e7609ecc09d102d8d831e34
2019-07-09 18:57:36 +00:00
Treehugger Robot
73155879c5 Merge "this is the subject" 2019-07-09 18:56:34 +00:00
Xin Li
b0c3474d91 DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: Icc51e3320747d5bb7bffb8ee7271effeca8ec199
2019-07-09 11:46:11 -07:00
Vic Yang
baa9f50cb2 Implement range-based pin list
This extends the original pin list generation to support specifying a
range within a file.  If any part of a file is pinned, its local file
header in the APK file is pinned as well.

Test: Build cuttlefish.
Bug: 136040313
Bug: 135953430
Change-Id: I6de8c2b4c2f35c6bf257f61414c6bce761233e51
2019-07-09 10:37:19 -07:00
Andrew Chant
5d323c1714 Catch unicode decode errors search for kernel ver
If a kernel happens to decode to gibberish (including
non-ascii bytes), catch the decoding error when
searching for the kernel version.

Bug: 137041171
Merged-In: Ic035b3a5c8c80025cb3cede7b0fdcf8a2e5a35fd
Change-Id: Ic035b3a5c8c80025cb3cede7b0fdcf8a2e5a35fd
2019-07-09 17:02:48 +00:00
Pirama Arumuga Nainar
f5c3510081 Merge "Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled." 2019-07-09 15:32:48 +00:00
SzuWei Lin
df09892cdb Revise GSI targets to inherit from mainline_system directly
The patch seperates gsi_common.mk to aosp_product.mk and
gsi_release.mk. Let GSI targets can be inherit with 3 parts:

- system: mainline_system.mk
- product: aosp_product.mk
- vendor: none or emulator vendor makefiles

aosp_product.mk includes the AOSP packages/settings will be in
the product partition.

GSI targets also includes the gsi_release.mk, which contains
the special settings for the GSI for releasing, ex.
skip_mount.cfg, extra VNDK, etc. After the patch, the build
targets inherit from aosp_$arch.mk will not apply these special
settings anymore.

The gsi_common.mk, legacy_gsi_common.mk and aosp_$arch_ab.mk will
be phased out later.

Bug: 135502030
Test: build gsi_arm64-userdebug and aosp_arm64-userdebug, compare
Test: root, system and vendor in out folder with/without the patch
Change-Id: Ic604ac91ba9a704e6507bac324d19bbf68063464
2019-07-09 18:13:22 +08:00
Treehugger Robot
b7a50ece30 Merge "Rename product_services to system_ext" 2019-07-09 08:58:04 +00:00
Justin Yun
6151e3f1ea Rename product_services to system_ext
Bug: 134359158
Test: build and check if system_ext.img is created
Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-07-09 08:57:19 +00:00
Tao Bao
ca82fc90f7 Additionally run releasetools_test with Python 3.
Bug: 131631303
Test: TreeHugger
Test: `atest releasetools_test`
Test: `atest releasetools_py3_test`
Change-Id: Ie00f48835aae41bc69ab8554b856a62aa3b497cc
2019-07-09 05:14:31 +00:00
Tao Bao
6e3ae4e849 Merge "releasetools: Make merge_target_files and its test Python 3 compatible." 2019-07-09 03:58:32 +00:00
Treehugger Robot
98b9c5dded Merge "Build: Fix test data no present in test suite zip files." 2019-07-09 00:26:41 +00:00
android-build-team Robot
8b4bc55df0 Make change and version bump to PPRL.190705.004
Change-Id: I585ce2af3e9a673a7e2ca2b89e79df24e3cd2c0d
2019-07-08 23:37:47 +00:00
Tao Bao
2ad4b82d45 releasetools: Make merge_target_files and its test Python 3 compatible.
And a few minor clean-ups to the styling.

Bug: 131631303
Test: python -m unittest test_merge_target_files
Test: python3 -m unittest test_merge_target_files
Test: Use `python merge_target_files` to merge two target_files zips.
Test: Use `python3 merge_target_files` to merge two target_files zips.
Change-Id: I8502dfb243408f658d022e8d5e5fbb60066e4ff0
2019-07-08 16:06:15 -07:00
Pirama Arumuga Nainar
b8f898ef88 Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled.
libprofile-extras has a wrapper to getenv() that appends the effective
userid (euid) of the current process to GCOV_PREFIX.  This avoids
conflicts and permissions issues when multiple processes try to
create/access the same directories and files under /data/misc/trace.

This library needs to be added and the -Wl,--wrap,getenv flag needs to
be passed to all link steps.  Since Android.mk does not propagate flags
and libraries across dependencies, this change just adds the library and
flag to all non-static-library Android.mk modules.  As a consequence,
*ALL* binaries created via Android.mk will have the signal handler and
property watcher thread in libprofile-extras but they are no-ops in
non-coverage-enabled binaries.

The dependency is added early enough in core/binary.mk so that the
LOCAL_SOONG_LINK_TYPE resolutions occur correctly.

Test: Verify that coverage files are written to
/data/misc/trace/<euid>/proc/... instead of /data/misc/trace/proc/...

Change-Id: I4d5f849c15e9a278253f2148185ddf3ab2878e2f
2019-07-08 15:13:31 -07:00
android-build-team Robot
b0faf21d08 Make change and version bump to PPRL.190705.003
Change-Id: I4ec9960a04017fec11dbe056da3f8e2fe513174a
2019-07-08 18:37:30 +00:00
Treehugger Robot
09736b4aaf Merge "Split merge_target_files function" 2019-07-08 06:33:18 +00:00
Kiyoung Kim
7cbeda728d Split merge_target_files function
Split merge_target_files function into several steps, so we can increate
readability and add conditional flows for other *SSI mixed build with less effort

Test: m -j & atest passed
Change-Id: I558f9dd5bca31b132a09cb36d9dfcd30c92efbc9
2019-07-08 12:13:05 +09:00
nelsonli
068d101077 Build: Fix test data no present in test suite zip files.
my_installed_test_data (LOCAL_TEST_DATA) no present in test
 suite zip files for device tests

Bug: 135957483
Test: 1. Remove the patch aosp/1008195
      2. m general-tests
      3. unzip general-tests.zip
      4. data files should exist in target/testcases/toybox-tests

Change-Id: I3f0a4d87e284c809625843d55dc5d35ef77e79bb
2019-07-05 23:52:45 +08:00
Bill Peckham
150c4b1f32 Merge "Move definition of create-vendor-odm-symlink within BUILDING_VENDOR_IMAGE" 2019-07-04 03:16:04 +00:00
Bill Peckham
1f9b8f0cc6 Move definition of create-vendor-odm-symlink within BUILDING_VENDOR_IMAGE
When we build the system image separately from the vendor image, we need the
/vendor/odm link (if any) to be created in the vendor build, not the system
build. This change moves the create-vendor-odm-symlink function outside the
BUILDING_SYSTEM_IMAGE gaurd, and inside the BUILDING_VENDOR_IMAGE gaurd.

Bug: 136516335
Test: Build vendor image, verify that /vendor/odm -> /odm
Change-Id: I6edf5d6d1fa0b2f632f67113f69a49b43f719941
2019-07-03 15:58:48 -07:00