Commit Graph

53806 Commits

Author SHA1 Message Date
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
Kiyoung Kim dc6566f3b2 Merge "Split merge_target_files function"
am: 09736b4aaf

Change-Id: Ic077a4bf1276ead627c1d09f67636626623a45ab
2019-07-07 23:51:33 -07: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 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 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
Anton Hansson 7d5dbf2be0 Revert "Make mainline device use apex"
This reverts commit 5284b77e6f.

Reason for revert: broke sdk_gphone_x86_64

Change-Id: I5cbaa767900d17039e8113f29b40d61c977764dc
Merged-In: I5cbaa767900d17039e8113f29b40d61c977764dc
(cherry picked from commit 1cb902e510)
2019-07-02 13:42:16 +00:00
Jiyong Park 09dcc68663 updatable_apex.mk is not inherited from mainline_system.mk
mainline_system.mk is inherited by not only Pixels but also products
like GSI and sdk_gphone where kernel isn't capable of supporting
updatable APEX.

Stop inheriting updatable_apex.mk from mainline_system.mk and let each
product to decide whether or not to inherit updatable_apex.mk.

Also, TARGET_FLATTEN_APEX is not set to true for GSI as it is the
default setting.

Bug: 132664085
Test: choosecombo 1 aosp_arm64 userdebug; get_build_var
TARGET_FLATTEN_APEX shows true
choosecombo 1 sdk_gphone userdebug; get_build_var TARGET_FLATTEN_APEX
shows true

Change-Id: I3c4e1e4b2bbebd675904d148dd18acb57ecbdfe9
Merged-In: I3c4e1e4b2bbebd675904d148dd18acb57ecbdfe9
(cherry picked from commit 5fd45bbeb0)
2019-07-02 13:38:23 +00: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 c3443e59a6 Merge "Uses the KNOWN_HIDL_INTERFACES file in host_init_verifier."
am: 28142690ba

Change-Id: Ibf879b8eeaab7de8fbe667a441dc7879815ac495
2019-07-01 14:59:23 -07:00
Yifan Hong 79c94f0c7c Merge "Change the condition for building super_empty.img."
am: f166825c4c

Change-Id: I51017892da56ef5082cfd5ac8c48acfa6d77d9bb
2019-07-01 14:58:44 -07:00
Daniel Norman 28142690ba Merge "Uses the KNOWN_HIDL_INTERFACES file in host_init_verifier." 2019-07-01 21:15:38 +00:00
Xin Li f8a2ca5abb DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: Ic49ed266f2c33c6b2d97d40d6a9fce03e6c67db2
2019-07-01 20:58:36 +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
Kavi Gupta 8532af0f29 Merge "Modify build to put dumpcoverage agent into /system/lib"
am: 4d77e4da45

Change-Id: Ia1eb965b2179b26e31976676365fa059ee5ba4ec
2019-06-28 16:01:41 -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
Anton Hansson 81c61780bb Merge "Move board config variable from mainline_system" am: bf95d43dc6
am: a17c7a1005

Change-Id: I1d945c577a363716f4389f05681c5d2c3ba22f07
2019-06-28 08:37:52 -07:00
Anton Hansson a17c7a1005 Merge "Move board config variable from mainline_system"
am: bf95d43dc6

Change-Id: Ia83dae93f93a2ce9e884e314b5d9b4d872c9ead0
2019-06-28 07:36:47 -07:00
Anton Hansson bf95d43dc6 Merge "Move board config variable from mainline_system" 2019-06-28 09:31:40 +00:00
Tao Bao c1c52e7b3b Merge "releasetools: Prefer the avbtool specified in target_files." am: 63cf1326da
am: d84a0531e9

Change-Id: Ieb93952f093a2d6e3d3c9796d61819c46cc4fcea
2019-06-27 19:04:51 -07:00
Kiyoung Kim f5fa68352a Merge "Add Linkerconfig to base system target" am: 4ec56d9214
am: 3d2f8e0661

Change-Id: I0c9a95b3b3796cd633dd6590fc8cc4e9bfb0591c
2019-06-27 19:01:47 -07:00
Tao Bao d84a0531e9 Merge "releasetools: Prefer the avbtool specified in target_files."
am: 63cf1326da

Change-Id: I814a098c4401ad16e03d9a0fbfff614319fc2947
2019-06-27 18:44:37 -07:00
Kiyoung Kim 3d2f8e0661 Merge "Add Linkerconfig to base system target"
am: 4ec56d9214

Change-Id: Ic92a7cbf82630e6966ebef8785589302a8a0ebab
2019-06-27 18:30:36 -07:00
Tao Bao 63cf1326da Merge "releasetools: Prefer the avbtool specified in target_files." 2019-06-28 01:18:21 +00:00
Anton Hansson b71e3b2d1d [automerger skipped] Remove lmk.log_stats sysprop from mainline_system
am: d8d0821252 -s ours
am skip reason: change_id I34696977f584a65741c6002e6688d86e66a1f121 with SHA1 fd81f696ed is in history

Change-Id: I35e01cd2a4cbda4a5f24c8d547c95f9370b2da97
2019-06-27 18:15:35 -07:00
Tao Bao a1b63421d9 Merge "releasetools: Make additional modules Python 3 compatible." am: e4f07795e4
am: ed7923be4f

Change-Id: Idf708c33684e7c7b96286b363d15bf947422323d
2019-06-27 17:58:45 -07:00
Kiyoung Kim 4ec56d9214 Merge "Add Linkerconfig to base system target" 2019-06-28 00:46:42 +00:00
Tao Bao ed7923be4f Merge "releasetools: Make additional modules Python 3 compatible."
am: e4f07795e4

Change-Id: Ie86de47d70a8f1876b3a49639a3c6d9fde926ebb
2019-06-27 17:31:42 -07:00
Tao Bao e4f07795e4 Merge "releasetools: Make additional modules Python 3 compatible." 2019-06-27 23:52:50 +00: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
Tao Bao 2cfd9b9077 Merge "releasetools: Clean up check_target_files_signatures.py." am: f6e8d46e2f
am: d82b810a77

Change-Id: Ie4cb3dff2fb4098714a25b4cf10643cd1951aae4
2019-06-27 16:08:24 -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
Steve Muckle 2b7a7c7c8f Merge "copy kernel modules to ramdisk, add modules.load[.recovery]"
am: c1d847e885

Change-Id: I699f63945afc14974a9134a1ee3cf604866bed81
2019-06-27 15:42:34 -07:00
Tao Bao d82b810a77 Merge "releasetools: Clean up check_target_files_signatures.py."
am: f6e8d46e2f

Change-Id: Ib38d151320c6c750986418a449970d1711f030a6
2019-06-27 15:41:38 -07:00
Tom Cherry e7561bc59e Merge "Switch host_init_verifier to getopt()"
am: fdbd55d259

Change-Id: I6e546020173a5d698bead239fee76ea2caba5c3a
2019-06-27 15:38:51 -07:00
Treehugger Robot c1d847e885 Merge "copy kernel modules to ramdisk, add modules.load[.recovery]" 2019-06-27 21:52:56 +00:00
Tao Bao f6e8d46e2f Merge "releasetools: Clean up check_target_files_signatures.py." 2019-06-27 21:36:14 +00:00
Tom Cherry fdbd55d259 Merge "Switch host_init_verifier to getopt()" 2019-06-27 21:09:07 +00:00
Tao Bao e815cec8f3 Merge "releasetools: Add sanity test for sign_apex." am: 2a917796b5
am: 03dc3694be

Change-Id: I0d2ad60b1df2f660a2a0658eaef000a19538b762
2019-06-27 11:31:55 -07:00
Tao Bao 03dc3694be Merge "releasetools: Add sanity test for sign_apex."
am: 2a917796b5

Change-Id: I59458af69a0b3f3680ddf7edab300c28a0b858ff
2019-06-27 11:24:13 -07:00
Tao Bao 2a917796b5 Merge "releasetools: Add sanity test for sign_apex." 2019-06-27 17:35:29 +00:00
Tao Bao a67e12d66f releasetools: Clean up check_target_files_signatures.py.
And make it Python 3 compatibile.

Bug: 131631303
Test: python check_target_files_signatures.py target-files.zip
Test: python3 check_target_files_signatures.py target-files.zip
Change-Id: I38e868c3124387f5543ad68c92c75917e40b7d8f
2019-06-27 10:24:10 -07: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