Commit graph

64068 commits

Author SHA1 Message Date
Treehugger Robot
396b0a2074 Merge "Add timestamp to ramdisk." 2020-10-08 03:50:37 +00:00
Treehugger Robot
2899375ad9 Merge "Skip unneeded notice files for DATA modules." am: 3592aedd78
Original change: https://android-review.googlesource.com/c/platform/build/+/1453719

Change-Id: Ic09de6f7ab9ddfc1326724430fef7893cc04b804
2020-10-08 02:36:07 +00:00
Treehugger Robot
3592aedd78 Merge "Skip unneeded notice files for DATA modules." 2020-10-08 02:17:18 +00:00
Treehugger Robot
7917ae1355 Merge "Include selinux_policy_* for product and system_ext." am: 09da8b1ba1
Original change: https://android-review.googlesource.com/c/platform/build/+/1452335

Change-Id: I8f1d74140367aa482aea788631406d73ddb83d2c
2020-10-08 00:59:57 +00:00
Treehugger Robot
09da8b1ba1 Merge "Include selinux_policy_* for product and system_ext." 2020-10-08 00:49:44 +00:00
Treehugger Robot
d9bf9e3e2c Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" am: c50ba5554a
Original change: https://android-review.googlesource.com/c/platform/build/+/1425158

Change-Id: Ibc43aa606d9ffeaa2a558ee02031abdfed0ebdb6
2020-10-07 21:14:33 +00:00
Jesse Hall
a16690c38c Skip unneeded notice files for DATA modules.
Non-installable generated intermediate data modules can have
notice files attached when they're defined in the same LOCAL_PATH
as the installable module that depends on them. This makes uninstallable
DATA modules silently ignore the fact that the build doesn't know where
to install the notice file.

Bug: 160248517
Test: build
Change-Id: I09a8a253dda52c2d78a1ebc0c33cd96e3505e2e3
Merged-In: I09a8a253dda52c2d78a1ebc0c33cd96e3505e2e3
2020-10-07 14:01:12 -07:00
Treehugger Robot
c50ba5554a Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" 2020-10-07 20:45:52 +00:00
Martin Stjernholm
bf4e8f4708 Make the build fail when the executable prebuilt target check fails.
Amends https://r.android.com/1439191; I realised echo-error doesn't
imply a false status.

Test: m art-check-{release,debug,testing}-apex-gen-fakebin
  without https://r.android.com/1441933.
Bug: 169375644
Change-Id: Ice75aeab30120e781df50a28c3dce3874ec0bfd1
2020-10-07 21:04:51 +01:00
Justin Yun
599330f865 Include selinux_policy_* for product and system_ext.
After separating selinux_policy_system_ext and selinux_policy_product
from the selinux_policy_nonsystem module, add them to
base_system_ext.mk and base_product.mk, respectively.

Bug: 170282998
Test: build and check boot
Change-Id: I03a4ae435898dd773f418d37f321ad0a37f17c3e
2020-10-07 18:16:45 +09:00
Felix Elsner
d7df770c4a soong_config: Support SYSTEM_EXT* sepolicy vars
The new variable name reflects its actual usage.

Keep compatibility with BOARD_PLAT_* because it has been a
convention for years. Also add warning messages for BOARD_PLAT_*
variables via KATI_deprecated_var.

Test: `make selinux_policy` with
      `SYSTEM_EXT_{PUBLIC,PRIVATE_SEPOLICY_DIRS}` set,
      observe additions in `$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/selinux`

Signed-off-by: Felix Elsner <google@ix5.org>
Change-Id: I58c64839cc513ae082cd3ee3c1e108843ea7439e
2020-10-07 15:56:52 +08:00
Felix Elsner
501ca68fd5 soong_config: Plat->SystemExt*SepolicyDirs
Align with changes in build/soong and system/sepolicy.

Test: build

Signed-off-by: Felix Elsner <google@ix5.org>
Change-Id: I73b773a4fb0bd626a989251d5c61381fcafaa1eb
2020-10-07 15:56:03 +08:00
Yifan Hong
7a532ab1e9 Add timestamp to ramdisk.
Add a build.prop file for ramdisk. Properties uses the
name ro.[product.]bootimage*.

These ro.[product.]bootimage.* properties are also included in recovery
properties.

The file is installed to boot/etc/build.prop under ramdisk.

On devices with dedicated recovery partition, the file is
installed to ramdisk/, which is installed to the ramdisk in the boot
image. The file is NOT installed to recovery/root to prevent
collision.

On devices with recovery_as_boot, in addition to ramdisk/, it is also
installed to recovery/root, which is installed to the ramdisk in the
boot image.

Test: m bootimage and inspect output
Bug: 169169031
Bug: 162623577

Change-Id: I94b993ce3214356036d038b6db57c4e1b755c111
2020-10-06 16:10:38 -07:00
Xin Li
ea79600e99 Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 2f171ac0a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1449163

Change-Id: I3a0710c04d92f7e2f12865a112ecf22e7a728c7b
2020-10-06 20:24:16 +00:00
The Android Open Source Project
78fc6e3738 DO NOT MERGE - Merge RP1A.201005.006 am: a4c45b8d52
Original change: https://android-review.googlesource.com/c/platform/build/+/1449163

Change-Id: I55f41e896efa0ebd2ab610a9497a7d5111f52e7d
2020-10-06 20:23:55 +00:00
Xin Li
2f171ac0a5 Merge "DO NOT MERGE - Merge RP1A.201005.006" 2020-10-06 20:17:27 +00:00
The Android Open Source Project
a4c45b8d52 DO NOT MERGE - Merge RP1A.201005.006
Bug: 168212094
Merged-In: Id3cbd4d6528f827eba6ac410ba2eb92d91d40901
Change-Id: Ic9c7b4d7339ab624418c1fbc95e66674cffdef71
2020-10-06 16:48:22 +00:00
Treehugger Robot
e57ea5ed1b Merge "Remove build tasks for vts10" am: 70b4738324
Original change: https://android-review.googlesource.com/c/platform/build/+/1449155

Change-Id: I787541a9dd4a51a81381830da0727b7d3ad6cbe2
2020-10-06 03:59:09 +00:00
Jooyung Han
674721e97f Merge "Use file_contexts for flattened apexes" am: a00c0f1f23
Original change: https://android-review.googlesource.com/c/platform/build/+/1435451

Change-Id: I2f92d53210523cc2d81c9e28392b0758a3eb7ea8
2020-10-06 03:43:54 +00:00
Treehugger Robot
70b4738324 Merge "Remove build tasks for vts10" 2020-10-06 03:30:31 +00:00
Jooyung Han
a00c0f1f23 Merge "Use file_contexts for flattened apexes" 2020-10-06 03:26:14 +00:00
Treehugger Robot
5da79a1876 Merge "tasks: find-sharedui-violation: Partition location" am: b1fbb747b8
Original change: https://android-review.googlesource.com/c/platform/build/+/1321234

Change-Id: Ifc568939321852f94be84fdd59432a21a745b41d
2020-10-06 02:32:55 +00:00
Treehugger Robot
b1fbb747b8 Merge "tasks: find-sharedui-violation: Partition location" 2020-10-06 02:14:47 +00:00
Dan Shi
82c4cb74c6 Remove build tasks for vts10
Bug: 169581727
Test: build
Change-Id: I865553ae07bc6eac3b90f87a494537102c398280
2020-10-05 10:17:21 -07:00
Yifan Hong
eddd0d6967 Merge "Fix boot-* to kernel-* dependency" am: 871e3c6032
Original change: https://android-review.googlesource.com/c/platform/build/+/1442279

Change-Id: I24687c7274df2ef7dff14ae440c46eebdf820f27
2020-10-02 19:33:40 +00:00
Yifan Hong
871e3c6032 Merge "Fix boot-* to kernel-* dependency" 2020-10-02 18:43:12 +00:00
Po-Chien Hsueh
2c3e8064ef Merge "Filter out host paths on platform-availability-check errors" am: 2a5719c809
Original change: https://android-review.googlesource.com/c/platform/build/+/1440896

Change-Id: Ie76b7b1cda93d468df1a4e360314b5465b64e812
2020-10-02 04:14:12 +00:00
Po-Chien Hsueh
2a5719c809 Merge "Filter out host paths on platform-availability-check errors" 2020-10-02 03:53:01 +00:00
Colin Cross
9d560baab5 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493

Change-Id: I755e82b2098fc7e8d839d477b8fdfaffd2bb0b62
2020-10-02 01:21:27 +00:00
Colin Cross
3ed9b8b7f9 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" 2020-10-02 01:06:10 +00:00
Mathieu Chartier
f96088c1da Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211

Change-Id: I30587ed5c7ab1662d190fb1178cc505a3e42aaf4
2020-09-30 22:11:45 +00:00
Mathieu Chartier
62ae5b55fe Merge "Do not set ro.iorapd.enable=true" 2020-09-30 21:54:59 +00:00
Yifan Hong
3e0b5d0355 Fix boot-* to kernel-* dependency
For example, if BOARD_KERNEL_BINARIES contains kernel-5.4, make sure
boot-5.4.img depends on kernel-5.4.

Test: remove kernel-5.4 from out directory then build boot image
Fixes: 169725104
Change-Id: I85624f3595c1a698bc27d19c73349138bb6e9e8c
2020-09-30 11:54:04 -07:00
Po-Chien Hsueh
e3b44f551c Filter out host paths on platform-availability-check errors
If a module, which is installed to both the host and the platform,
fails the platform-availability-check, the build system might use
the host install path to report errors. Filter out the host install
path so that the platform install path is used.

Bug: 169393514
Test: make
Change-Id: Ib39715ffc45cc32e3bd7ce5f2a3725d243f3237f
2020-09-30 08:18:03 +00:00
Treehugger Robot
650771c5d4 Merge "Fix conflict with common zsh alias" am: fd4a406174
Original change: https://android-review.googlesource.com/c/platform/build/+/1434523

Change-Id: I4f6681d5b8feda5c575870840700b8d905cc9030
2020-09-29 23:10:12 +00:00
Treehugger Robot
fd4a406174 Merge "Fix conflict with common zsh alias" 2020-09-29 22:52:17 +00:00
Ben Taitelbaum
8c2c9cfa9d Fix conflict with common zsh alias
oh-my-zsh common-aliases plugin defines `alias -g T='| tail'`, which causes an
error with the line `local T dir f`.

Making these lines more explicit resolves this issue, while also being clearer
that the intent is to clear out the local variables.

Bug: 169191000
Fix: 169191000
Test: source build/envsetup.sh; lunch <target>; m
Change-Id: Ief27aa3d9f541d0c39c6c11d7d771818d6493d31
2020-09-29 20:50:57 +00:00
Janis Danisevskis
3cc7647af1 Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt
Change-Id: Icd9644e468a29d5ca47291faaaa9f5ca3fc4902c
2020-09-29 07:09:45 -07:00
Yifeng Zeng
f54e9714bc Merge "Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set." am: 97a498b177
Original change: https://android-review.googlesource.com/c/platform/build/+/1439143

Change-Id: I331b855ffa98aa34c539f8688ba7590fba9c8998
2020-09-29 04:36:17 +00:00
Yifeng Zeng
97a498b177 Merge "Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set." 2020-09-29 04:06:36 +00:00
Treehugger Robot
9fe95069f2 Merge "Source rbesetup.sh from any location inside of a repo directory." am: b2c54c81da
Original change: https://android-review.googlesource.com/c/platform/build/+/1441073

Change-Id: Ic51e9b55891840769390c4a8a8355fc027c8a348
2020-09-29 03:49:50 +00:00
Treehugger Robot
b2c54c81da Merge "Source rbesetup.sh from any location inside of a repo directory." 2020-09-29 03:25:53 +00:00
Yifeng Zeng
d17bffd01f Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set.
Test: build/soong/soong_ui.bash --make-mode SKIP_ABI_CHECKS=true SOONG_COLLECT_JAVA_DEPS=true TARGET_PRODUCT=aosp_cf_x86_phone TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=/usr/local/google/home/yifengzeng/temp EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS="*" NATIVE_COVERAGE_EXCLUDE_PATHS="art bionic/libc device" tests

Bug: 168755196
Change-Id: Id13d3a4579734bc70bc0ce3463a05ee9a052f1dc
2020-09-28 23:16:51 +00:00
Patrice Arruda
96a3f9df33 Source rbesetup.sh from any location inside of a repo directory.
The current rbesetup.sh has to be source from the root directory
of the checked out repo since it has a relative path to the sourced
build/envsetup.sh script. A function was written in rbesetup.sh
script to source the rbesetup.sh script anywhere inside of a
checked out repo. Added additional error checking to validate
the envsetup.sh is available and not to continue sourcing the script
if envsetup.sh script is not found.

Fixes: b/169438960
Test: Sourced the rbesetup script from
        * external directory
	* inside of a symlink
	* outside of repo (sourcing fails which is correct)
	* root repo
Change-Id: I2db66a444074adca4d4ab87b8786e9044a3646f8
2020-09-28 22:09:41 +00:00
Martin Stjernholm
c14071eb7d Merge "Do not chmod the symlink target when a prebuilt binary is symlinked." am: 0de50208a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1439191

Change-Id: Icb4dddce2d980bce09353b8fb98758f07e297c81
2020-09-28 13:44:17 +00:00
Martin Stjernholm
0de50208a3 Merge "Do not chmod the symlink target when a prebuilt binary is symlinked." 2020-09-28 13:02:33 +00:00
Yo Chiang
8e1fcee324 Merge changes from topic "exclude-system-shared-libs-from-elfcheck-suggestions" am: d311799206
Original change: https://android-review.googlesource.com/c/platform/build/+/1434012

Change-Id: I3bd3b4b37ffd8f7b36c853d2a8822f803b98f2ba
2020-09-28 04:13:55 +00:00
Logan Chien
8abf06faa4 Exclude system shared libs from fix suggestion am: 751a987bcc
Original change: https://android-review.googlesource.com/c/platform/build/+/1190333

Change-Id: Ie9ff04af02f76aa0aafd934aa1cb8d13b041bdd0
2020-09-28 04:13:26 +00:00
Yo Chiang
d311799206 Merge changes from topic "exclude-system-shared-libs-from-elfcheck-suggestions"
* changes:
  Pass the value of system_shared_libs from Android.bp to check_elf_file.py
  Exclude system shared libs from fix suggestion
2020-09-28 03:54:27 +00:00
Wang Han
4a4a4df0af Do not set ro.iorapd.enable=true
* This is true by default, this is redundant.

Change-Id: I936d701c8b644ea4667bf855a71448c8d7a1448a
2020-09-27 13:11:18 +00:00