Commit Graph

20681 Commits

Author SHA1 Message Date
Logan Chien
014de67d06 Merge changes Ia0410da8,Id756340f
am: 1277b8cca1

Change-Id: Ideb6440a6e0b1738c08beb021eace76c907ab685
2019-07-13 14:04:53 -07: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
Steve Muckle
b81725dff1 Merge "install modules.softdep from depmod output"
am: 10115f54b9

Change-Id: I3b8ac4d326b09da334eb29bcf5b7ff197247bbd9
2019-07-12 16:02:48 -07:00
Treehugger Robot
10115f54b9 Merge "install modules.softdep from depmod output" 2019-07-12 22:20:22 +00:00
Daniel Norman
0d1b2ddaad Merge "Changes host_init_verifier to use hidl interface inheritance hierarchy."
am: 858fa08427

Change-Id: I4257caefab23a66d34f3160e922bff5e140e002d
2019-07-12 11:32:38 -07: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
7a45e0ccb9 Merge "Stop building unnecessary tarballs."
am: 9a4b84de56

Change-Id: I9465ce123bc1d5ab9662069af6181dd7382eff57
2019-07-12 08:10:05 -07:00
Elliott Hughes
9a4b84de56 Merge "Stop building unnecessary tarballs." 2019-07-12 14:52:53 +00:00
Elliott Hughes
440c99f1f2 Stop building unnecessary tarballs.
Test: treehugger
Change-Id: Iaba2aa6d09ad891f37171cc76778d08c78c78f93
2019-07-12 05:04:12 +00:00
Steve Muckle
155c1cef48 Merge "add BOARD_VENDOR_RAMDISK_KERNEL_MODULES[_LOAD]"
am: 3f7c416650

Change-Id: I1930149589978edeebb4c00eb2bda56beca7c7b4
2019-07-11 21:48:46 -07: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
8eec867605 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 2019-07-11 18:33:34 +00:00
Paul Duffin
533733d1e8 Merge "Remove direct dependency on art/tools/veridex/appcompat.sh"
am: 831197ee31

Change-Id: I581234249a75c3fa2eca56976a271e122c834582
2019-07-11 08:08:56 -07: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
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
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
Pirama Arumuga Nainar
eb7c5e3926 Merge "Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled."
am: f5c3510081

Change-Id: Ib7a0595cd871ad193ff38bd138b8b015c56e843b
2019-07-09 08:57:05 -07: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
Justin Yun
8f11ad5d40 Merge "Rename product_services to system_ext"
am: b7a50ece30

Change-Id: I7a56d76d3543b2bc4b1d0b24e54e8dd82ab7f15a
2019-07-09 02:14:55 -07: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
nelsonli
4cb85b5865 Merge "Build: Fix test data no present in test suite zip files."
am: 98b9c5dded

Change-Id: Ifd655c5d413e8db73d0220b454a28aacc5a5173a
2019-07-08 17:57:40 -07: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
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
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
653e527b5a Merge "Move definition of create-vendor-odm-symlink within BUILDING_VENDOR_IMAGE"
am: 150c4b1f32

Change-Id: Idd62c9cfc5e38c0e896e09877f3fc44a58c28091
2019-07-03 20:54:39 -07: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
TreeHugger Robot
218adad125 Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master 2019-07-02 07:40:58 +00:00
Daniel Norman
28142690ba Merge "Uses the KNOWN_HIDL_INTERFACES file in host_init_verifier." 2019-07-01 21:15:38 +00:00
Yifan Hong
f166825c4c Merge "Change the condition for building super_empty.img." 2019-07-01 20:51:38 +00:00
Kavi Gupta
3ff8608d6f Merge "Modify build to put dumpcoverage agent into /system/lib" am: 4d77e4da45
am: 8532af0f29

Change-Id: If4b5a5dce624e064778f2175a1b153a1e12be98c
2019-06-28 16:17:00 -07:00
Treehugger Robot
4d77e4da45 Merge "Modify build to put dumpcoverage agent into /system/lib" 2019-06-28 22:41:14 +00:00
Tao Bao
48a2feb670 Change the condition for building super_empty.img.
This CL changes the condition for building super_empty.img from
PRODUCT_BUILD_SUPER_PARTITION to PRODUCT_USE_DYNAMIC_PARTITIONS, as a
follow-up to the change in [1].

With the CL in [1], it skips building super.img and super_empty.img both
when turning off PRODUCT_BUILD_SUPER_PARTITION. However, the latter
should be mandatory whenever dynamic partitions is enabled. Because
fastboot relies on this file to properly flash dynamic partitions. Plus,
the cost for building super_empty.img is much lower than the one for
super.img.

As part of the change, it'll write group info into target_files when
building with PRODUCT_BUILD_SUPER_PARTITION == false. It's the work for
target_files merging script to determine the values to be picked up. The
current logic in merge_target_files.py always uses the one from vendor
target_files. This CL adds a testcase to ensure the behavior.

[1] https://android-review.googlesource.com/c/platform/build/+/928756

Bug: 135752763
Test: `m dist` with a target that sets PRODUCT_BUILD_SUPER_PARTITION to
      false. Check the built artifacts contain super_empty.img. Verify
      that the build can be flashed properly.
Change-Id: I277f087eab45663a6c3b33333d16e9e576c1c25c
2019-06-28 14:23:53 -07:00
Steve Muckle
003f35d0d5 Merge "copy kernel modules to ramdisk, add modules.load[.recovery]" am: c1d847e885
am: 2b7a7c7c8f

Change-Id: Icab683e5802f6c18cddd180a1c5bbcd14c9eb268
2019-06-27 16:09:17 -07:00
Tom Cherry
61ca76dc12 Merge "Switch host_init_verifier to getopt()" am: fdbd55d259
am: e7561bc59e

Change-Id: Idc5b4914b4b8e56deecda93a5fbadb629b301be6
2019-06-27 16:04:09 -07:00
Daniel Norman
ce664b0a37 Uses the KNOWN_HIDL_INTERFACES file in host_init_verifier.
This file is used to check that each interface in an init_rc file is a
known hidl_interface.

Test: Adding a misspelling to an init_rc's interface line and observing
build failure.
Bug: 77646540
Change-Id: I30c2dff29679b95085b5c76f6d68e4d794f965e9
2019-06-27 15:54:43 -07:00
Treehugger Robot
c1d847e885 Merge "copy kernel modules to ramdisk, add modules.load[.recovery]" 2019-06-27 21:52:56 +00:00
Mathieu Chartier
73d6c1f7b8 Merge "Revert "Revert "Remove option to create boot image based on preloaded classes""" am: 14c01bea97
am: 92250e43a1

Change-Id: I8c810dfdd8bedd19d1280f5ef719f36cad5e0418
2019-06-27 09:33:21 -07:00
Kavi Gupta
7185f8cc2d Modify build to put dumpcoverage agent into /system/lib
This location allows the agent to be attached to arbitrary processes.

It only makes sense to include libdumpcoverage.so on coverage builds,
as these are the only builds that have any information to be dumped.

Test: manual, used examples in README (see other CL) to test whether
it works on a userdebug_coverage build on cuttlefish

Change-Id: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda
2019-06-27 09:28:39 -07:00
Tom Cherry
f0bc919754 Switch host_init_verifier to getopt()
Test: build, including init script verification, works
Change-Id: Ia786cdf14eb9449ad2d5a6ac9b571c6be709f1e5
2019-06-27 09:21:53 -07:00
Mathieu Chartier
14c01bea97 Merge "Revert "Revert "Remove option to create boot image based on preloaded classes""" 2019-06-27 15:56:52 +00:00
Kiyoung Kim
50cf856b4a Merge "Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and BOARD_PREBUILT_BOOTIMAGE is set." am: 6b261101e4
am: ed3c9a9ad6

Change-Id: I96fa27bf51caf484c0301e6a42bdbbcc6b699d20
2019-06-26 23:37:35 -07:00
Kiyoung Kim
6b261101e4 Merge "Set INSTALLED_BOOTIMAGE_TARGET in case of TARGET_NO_KERNEL is true and BOARD_PREBUILT_BOOTIMAGE is set." 2019-06-27 05:44:33 +00:00
Steve Muckle
474e4d04a3 copy kernel modules to ramdisk, add modules.load[.recovery]
Build support exists to copy a set of kernel modules to the recovery,
vendor, and odm images. Extend similar support for copying kernel
modules to the ramdisk via BOARD_RAMDISK_KERNEL_MODULES. If
BOARD_USES_RECOVERY_AS_BOOT, then BOARD_RAMDISK_KERNEL_MODULES is
added to the set of modules to be copied to recovery.

Libmodprobe now supports reading a list of kernel modules to be loaded.
Enable the creation of modules.load and modules.load.recovery files.
These files contain the contents of
BOARD_[RAMDISK|VENDOR|ODM|RECOVERY]_KERNEL_MODULES_LOAD, or if those
variables are not set, the contents of
BOARD_[RAMDISK|VENDOR|ODM|RECOVERY]_KERNEL_MODULES (indicating all
modules should be loaded by default). This allows for
optional customization of the set of modules to be loaded by
libmodprobe and the order they are loaded in.

Bug: 130585369
Change-Id: I9340787d31d71aebc8552344675d9696c189a8a1
2019-06-26 17:16:30 -07:00
Mathieu Chartier
a5828f21f8 Revert "Revert "Remove option to create boot image based on preloaded classes""
Test: make
Test: build/soong/scripts/build-ndk-prebuilts.sh

This reverts commit 7139459ac7.

Change-Id: I7449e57cdcaccc60decca2df929b1b9e920f5904
2019-06-26 14:43:57 -07:00
Colin Cross
670cc43966 Merge "Don't pass --legacy by default to aapt2 compile" am: 1aa3ff6fea
am: 9e0a0d7a2a

Change-Id: I45db8a6ff924cf691071bb8c6de067bc3b791655
2019-06-26 11:35:47 -07:00