Colin Cross
988ca5f04e
Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9
am: 9d560baab5
am: 2afae90d46
am: 5ff38b8498
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493
Change-Id: I61af4fa7d12de65ad1f8fa056a297f40b61b63ff
2020-10-02 02:41:11 +00:00
Colin Cross
5ff38b8498
Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9
am: 9d560baab5
am: 2afae90d46
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493
Change-Id: I8b4e10e7b973297b2263fa3e41ccdb77b33c6fc4
2020-10-02 02:27:32 +00:00
Colin Cross
2afae90d46
Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9
am: 9d560baab5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493
Change-Id: I9d408d5e0b04788f05663d86aa11e1f8c5c844a4
2020-10-02 01:52:47 +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
802767b583
Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe
am: f96088c1da
am: 49f48872ff
am: b6d672978c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211
Change-Id: I6b7c729635db5be80a3651d0d82939d46b697b6c
2020-09-30 23:31:26 +00:00
Mathieu Chartier
b6d672978c
Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe
am: f96088c1da
am: 49f48872ff
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211
Change-Id: I7e695163a18e2762a1365fe06c37d1567df0a097
2020-09-30 23:17:16 +00:00
Mathieu Chartier
49f48872ff
Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe
am: f96088c1da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211
Change-Id: Ia800db8a9383727205e4f533911e7649fb158118
2020-09-30 22:32:15 +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
Kousik Kumar
8653d62fe9
resolve merge conflicts of a7beb10933
to rvc-dev am: 602859b186
am: 89473c286c
am: 247d79d08b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12663184
Change-Id: Ieb48a49ddc8f3f8840b71a634e58f2d055a96fa4
2020-09-30 18:58:47 +00:00
Kousik Kumar
247d79d08b
resolve merge conflicts of a7beb10933
to rvc-dev am: 602859b186
am: 89473c286c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12663184
Change-Id: I85b66ca0536a8e5587b645eef1121e4055aa54ce
2020-09-30 18:46:39 +00:00
Kousik Kumar
89473c286c
resolve merge conflicts of a7beb10933
to rvc-dev am: 602859b186
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12663184
Change-Id: I6e081b088020db51fa8c4158b2ab09ef11ea026b
2020-09-30 18:33:48 +00:00
Treehugger Robot
42c26f9e0e
Merge "Fix conflict with common zsh alias" am: fd4a406174
am: 650771c5d4
am: 1c056cfbbc
am: 43e387874c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1434523
Change-Id: Ifda0651290b5133331243bcf0fa02f29d30ef232
2020-09-30 00:30:03 +00:00
Treehugger Robot
43e387874c
Merge "Fix conflict with common zsh alias" am: fd4a406174
am: 650771c5d4
am: 1c056cfbbc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1434523
Change-Id: I940f044edcf0352d7aa743ed5ab193ef931b0b6c
2020-09-29 23:43:15 +00:00
Treehugger Robot
1c056cfbbc
Merge "Fix conflict with common zsh alias" am: fd4a406174
am: 650771c5d4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1434523
Change-Id: I096704359f0808b411207335f86d7ac792041fd0
2020-09-29 23:28:35 +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
Yifeng Zeng
ebb85cc20e
Merge "Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set." am: 97a498b177
am: f54e9714bc
am: 4bead4d180
am: b2afcdedfb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1439143
Change-Id: Id47122b14f27c40063b619112e9d0e1adca30434
2020-09-29 05:05:44 +00:00
Treehugger Robot
092e4563d3
Merge "Source rbesetup.sh from any location inside of a repo directory." am: b2c54c81da
am: 9fe95069f2
am: ce17c8b957
am: efa24bcade
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1441073
Change-Id: I4dabc0e87ab8ca3625e963e0b708625411458fb4
2020-09-29 05:05:32 +00:00
Yifeng Zeng
b2afcdedfb
Merge "Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set." am: 97a498b177
am: f54e9714bc
am: 4bead4d180
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1439143
Change-Id: I93cf04ae1913c6f83ab450f83b25bd7639756b06
2020-09-29 04:53:55 +00:00
Treehugger Robot
efa24bcade
Merge "Source rbesetup.sh from any location inside of a repo directory." am: b2c54c81da
am: 9fe95069f2
am: ce17c8b957
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1441073
Change-Id: I428934075350d4ab1e75aa26461617ccf9073d3b
2020-09-29 04:53:44 +00:00
Yifeng Zeng
4bead4d180
Merge "Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set." am: 97a498b177
am: f54e9714bc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1439143
Change-Id: Idb4076cf060bdf358f4f54a042f30fc95e62743c
2020-09-29 04:45:16 +00: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
Treehugger Robot
ce17c8b957
Merge "Source rbesetup.sh from any location inside of a repo directory." am: b2c54c81da
am: 9fe95069f2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1441073
Change-Id: I0904c522ad2566755a64e2bc3c88eeacb4ae2a14
2020-09-29 04:36:14 +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
5b167cc9a7
Merge "Do not chmod the symlink target when a prebuilt binary is symlinked." am: 0de50208a3
am: c14071eb7d
am: 66990f95b3
am: 92378961f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1439191
Change-Id: I92a2e5502f6eb15c60329ac008a7da7bc37577c4
2020-09-28 15:07:03 +00:00
Martin Stjernholm
92378961f0
Merge "Do not chmod the symlink target when a prebuilt binary is symlinked." am: 0de50208a3
am: c14071eb7d
am: 66990f95b3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1439191
Change-Id: Id2d8bff6cb50cd6456dd118eac7c60349a901864
2020-09-28 14:15:39 +00:00
Martin Stjernholm
66990f95b3
Merge "Do not chmod the symlink target when a prebuilt binary is symlinked." am: 0de50208a3
am: c14071eb7d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1439191
Change-Id: Ib861b5d8326dd987caf7297b7b9214ac41ffadc1
2020-09-28 14:03:38 +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
71b87cbaca
Merge changes from topic "exclude-system-shared-libs-from-elfcheck-suggestions" am: d311799206
am: 8e1fcee324
am: d292b04bd9
am: a399ab33fc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1434012
Change-Id: I9cd266efd9568d03fc88aaf837b69730f7a35396
2020-09-28 05:35:17 +00:00
Logan Chien
1bba990bb8
Exclude system shared libs from fix suggestion am: 751a987bcc
am: 8abf06faa4
am: f4dd14c323
am: 40d57c3be7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1190333
Change-Id: Ie8c60f36b1e576c26dba18c050f82ca167225e16
2020-09-28 05:35:14 +00:00
Yo Chiang
a399ab33fc
Merge changes from topic "exclude-system-shared-libs-from-elfcheck-suggestions" am: d311799206
am: 8e1fcee324
am: d292b04bd9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1434012
Change-Id: I6559a18a51328819b6c9a8c5c15008ca702e68f1
2020-09-28 05:00:37 +00:00
Logan Chien
40d57c3be7
Exclude system shared libs from fix suggestion am: 751a987bcc
am: 8abf06faa4
am: f4dd14c323
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1190333
Change-Id: I186a94c387f5bc218d95ebc0a40c00f03edd4692
2020-09-28 05:00:34 +00:00
Yo Chiang
d292b04bd9
Merge changes from topic "exclude-system-shared-libs-from-elfcheck-suggestions" am: d311799206
am: 8e1fcee324
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1434012
Change-Id: I7ad43461afc3a2a0d6e7ddc067418a90e937af83
2020-09-28 04:31:07 +00:00
Logan Chien
f4dd14c323
Exclude system shared libs from fix suggestion am: 751a987bcc
am: 8abf06faa4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1190333
Change-Id: I1615ca636f1e09468a4eea39bd80125c03a50916
2020-09-28 04:31:03 +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
Chris Gross
b2d6786b05
Merge "Misc fixes to release tools." am: 69c6598b21
am: 208b59c42f
am: 82dcdba83d
am: e1f0a508d2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1427972
Change-Id: I973c587946c564dfb2caf1a16b85e9d122601e76
2020-09-26 19:05:04 +00:00
Chris Gross
e1f0a508d2
Merge "Misc fixes to release tools." am: 69c6598b21
am: 208b59c42f
am: 82dcdba83d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1427972
Change-Id: I44f93d32e18ac2a59d1ac9b2b090fa5728bb0498
2020-09-26 18:54:10 +00:00
Chris Gross
82dcdba83d
Merge "Misc fixes to release tools." am: 69c6598b21
am: 208b59c42f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1427972
Change-Id: Ie70e9857583e1af8541838b7c7b2228b00a8497f
2020-09-26 18:39:56 +00:00
Chris Gross
208b59c42f
Merge "Misc fixes to release tools." am: 69c6598b21
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1427972
Change-Id: I4260aced4c23b479428685a8e535782649dee734
2020-09-26 18:25:50 +00:00