Commit Graph

14507 Commits

Author SHA1 Message Date
Dimitry Ivanov
fb87e6edd4 Merge "Make relative path for native_bridge binaries configurable" am: 2ca7a8835e am: 1866802e07
am: ddf273bcd4

Change-Id: I982707e1f8ee26042dd8e9d9fcfd611e402f93f3
2019-07-16 02:54:53 -07:00
Dimitry Ivanov
ddf273bcd4 Merge "Make relative path for native_bridge binaries configurable" am: 2ca7a8835e
am: 1866802e07

Change-Id: I49f854acc05be48cd69669a1b4e4102c0b94df9e
2019-07-16 02:49:42 -07:00
Dimitry Ivanov
1866802e07 Merge "Make relative path for native_bridge binaries configurable"
am: 2ca7a8835e

Change-Id: I2cc8f8145c6464cf0ab91a602a5861ffc5a24505
2019-07-16 02:43:41 -07:00
Dimitry Ivanov
2ca7a8835e Merge "Make relative path for native_bridge binaries configurable" 2019-07-16 09:17:35 +00:00
Android Build Merger (Role)
660bf6c43e Merge "[automerger skipped] Merge changes I2c00af07,I2f49fa7d into qt-dev am: 7610ba915c -s ours am: cadd08803f -s ours am skip reason: change_id I2c00af07aac4a15770d3acab011a36e2e4803bfc with SHA1 e3ef3c8f0c is in history" into qt-r1-dev-plus-aosp 2019-07-16 08:42:40 +00:00
Jiyong Park
45b42ea930 [automerger skipped] Merge changes I2c00af07,I2f49fa7d into qt-dev am: 7610ba915c -s ours
am: cadd08803f -s ours
am skip reason: change_id I2c00af07aac4a15770d3acab011a36e2e4803bfc with SHA1 e3ef3c8f0c is in history

Change-Id: I9a9f33f222133ffba40d75eed1f803d7481e6fce
2019-07-16 01:42:28 -07:00
Jiyong Park
20541d66dc [automerger skipped] Merge changes I2c00af07,I2f49fa7d into qt-dev am: 7610ba915c
am: a0b5690cb8 -s ours
am skip reason: change_id I2c00af07aac4a15770d3acab011a36e2e4803bfc with SHA1 e3ef3c8f0c is in history

Change-Id: I639c02d1f9a76e6a9ac027f01b0216127e206765
2019-07-16 01:42:16 -07:00
Jiyong Park
a0b5690cb8 Merge changes I2c00af07,I2f49fa7d into qt-dev
am: 7610ba915c

Change-Id: I17ca6fb856a9c04cac0651934eb19b7939c6b00e
2019-07-16 01:36:26 -07:00
Jiyong Park
cadd08803f [automerger skipped] Merge changes I2c00af07,I2f49fa7d into qt-dev
am: 7610ba915c -s ours
am skip reason: change_id I2c00af07aac4a15770d3acab011a36e2e4803bfc with SHA1 e3ef3c8f0c is in history

Change-Id: I777b32e6290cf691500468c9bbc05c08f1b6d1e6
2019-07-16 01:36:22 -07:00
TreeHugger Robot
7610ba915c Merge changes I2c00af07,I2f49fa7d into qt-dev
* changes:
  Fix the unbundled mainline module build
  Revert "Don't build hiddenapi flags or encode dex for unbundled builds"
2019-07-16 04:16:31 +00:00
Jooyung Han
82a11e874a Merge "soong: Fix AndroidMk with *Required properties" am: 0f7dbd0d55 am: 962982a731
am: 680ae837fb

Change-Id: Ieba987934e7aad45d85f3914b43378e813973e08
2019-07-15 19:50:42 -07:00
Jooyung Han
680ae837fb Merge "soong: Fix AndroidMk with *Required properties" am: 0f7dbd0d55
am: 962982a731

Change-Id: Ia207ff1521e876825a7ca9fac1c433e3d4b1b652
2019-07-15 19:41:37 -07:00
Jooyung Han
962982a731 Merge "soong: Fix AndroidMk with *Required properties"
am: 0f7dbd0d55

Change-Id: I588aeda47a66334b16294e36333f653001fd37b1
2019-07-15 19:31:36 -07:00
Treehugger Robot
0f7dbd0d55 Merge "soong: Fix AndroidMk with *Required properties" 2019-07-16 02:09:29 +00:00
Jaewoong Jung
870b332367 Merge "Fix a bug in generateNoticeRule." am: 34b1b27981 am: 4f4a498032
am: 3aa68561eb

Change-Id: I650536737d43710f951e23595c53b1ffb4b9ead9
2019-07-15 18:42:28 -07:00
Jaewoong Jung
3aa68561eb Merge "Fix a bug in generateNoticeRule." am: 34b1b27981
am: 4f4a498032

Change-Id: I66f6fcefd987da6e2cecd939639f1c8b5efb0c98
2019-07-15 18:32:25 -07:00
Jaewoong Jung
4f4a498032 Merge "Fix a bug in generateNoticeRule."
am: 34b1b27981

Change-Id: I537b4887488be48ce96ee0a3a12d00d352044540
2019-07-15 18:22:25 -07:00
Treehugger Robot
34b1b27981 Merge "Fix a bug in generateNoticeRule." 2019-07-16 00:47:58 +00:00
Jiyong Park
3da8f9e19d Fix the unbundled mainline module build am: e3ef3c8f0c am: 9da7bcfd77
am: 731b5fc01c

Change-Id: I2f406fd40d8069eddf2ad0071c2b5668b1440563
2019-07-15 15:43:23 -07:00
Jiyong Park
7effeb6628 Revert "Don't build hiddenapi flags or encode dex for unbundled builds" am: 09cb629c15 am: 61b5d0672d
am: 6a0c0343fa

Change-Id: Ib50a0e3ffc508a4345848ee011b6c4cdd9f60083
2019-07-15 15:43:17 -07:00
Jiyong Park
af776ec279 [automerger skipped] Don't use APEX prebuilts when asan is on am: 50b81e532b am: 0f0d51c157 -s ours
am: 3307879d8a -s ours
am skip reason: change_id Ic436ad06e724af952d99fb8e66358a595450eb84 with SHA1 3b98a509f1 is in history

Change-Id: Icb134c50f09223b37d58051b4447242b30b0dbcb
2019-07-15 15:43:10 -07:00
Jiyong Park
731b5fc01c Fix the unbundled mainline module build am: e3ef3c8f0c
am: 9da7bcfd77

Change-Id: I6df2e283c0a355ac60658e22ef687033b88253f9
2019-07-15 15:31:31 -07:00
Jiyong Park
6a0c0343fa Revert "Don't build hiddenapi flags or encode dex for unbundled builds" am: 09cb629c15
am: 61b5d0672d

Change-Id: Id460a66db465ae8a5b69893f78b68fd767c8b96f
2019-07-15 15:31:25 -07:00
Jiyong Park
3307879d8a [automerger skipped] Don't use APEX prebuilts when asan is on am: 50b81e532b
am: 0f0d51c157 -s ours
am skip reason: change_id Ic436ad06e724af952d99fb8e66358a595450eb84 with SHA1 3b98a509f1 is in history

Change-Id: I26d5dbbbffdbefdc757fd5fefccd49910fb40cb4
2019-07-15 15:31:19 -07:00
Jiyong Park
9da7bcfd77 Fix the unbundled mainline module build
am: e3ef3c8f0c

Change-Id: Ic5fdbf4dc40d6744f5c97e9eafc3672f4aca975e
2019-07-15 15:20:20 -07:00
Jiyong Park
61b5d0672d Revert "Don't build hiddenapi flags or encode dex for unbundled builds"
am: 09cb629c15

Change-Id: I13583e6b4e6c59c2c2904349f61179a49a0a36ba
2019-07-15 15:20:14 -07:00
Jiyong Park
0f0d51c157 Don't use APEX prebuilts when asan is on
am: 50b81e532b

Change-Id: I74072aff547ae17930276bb9b45064e2efbde56b
2019-07-15 15:20:09 -07:00
Android Build Merger (Role)
5f7fae4c27 Merge "[automerger skipped] Support require_root in auto-gen test configs am: 40c0afeb7c -s ours am: 63583d4a49 -s ours am skip reason: change_id Ia07503e338935d6aa92560e7cf7b18d2a4c51243 with SHA1 37ee3b8f49 is in history" into qt-r1-dev-plus-aosp 2019-07-15 18:15:29 +00:00
Dan Shi
b759cf477a [automerger skipped] Support require_root in auto-gen test configs am: 40c0afeb7c -s ours
am: 63583d4a49 -s ours
am skip reason: change_id Ia07503e338935d6aa92560e7cf7b18d2a4c51243 with SHA1 37ee3b8f49 is in history

Change-Id: Ie43b51178bd77f6a1a97db99bf3670b3eb420f66
2019-07-15 11:14:53 -07:00
Dan Shi
968c064a43 [automerger skipped] Support require_root in auto-gen test configs am: 40c0afeb7c
am: b942bd8030 -s ours
am skip reason: change_id Ia07503e338935d6aa92560e7cf7b18d2a4c51243 with SHA1 37ee3b8f49 is in history

Change-Id: I70cf096165b54eb09409018c36793c25288ee43d
2019-07-15 11:14:48 -07:00
dimitry
8d6dde8831 Make relative path for native_bridge binaries configurable
This change introduces NativeBridgeRelativePath and
NativeBridgeSecondaryRelativePath product variables to
make relative path to native_bridge binaries configurable.

It also removes moves information about native bridge
host architecture to Target and sets it during decodeTargetProductVariables

Test: make PRODUCT-cf_x86_phone-userdebug dist
Change-Id: Ie736e81eae507e1775566ce9f29135011b12af27
2019-07-15 20:04:07 +02:00
Dan Shi
b942bd8030 Support require_root in auto-gen test configs
am: 40c0afeb7c

Change-Id: Icfdb4e7517948722f90af17dca4b41aa0840b86f
2019-07-15 11:04:06 -07:00
Dan Shi
63583d4a49 [automerger skipped] Support require_root in auto-gen test configs
am: 40c0afeb7c -s ours
am skip reason: change_id Ia07503e338935d6aa92560e7cf7b18d2a4c51243 with SHA1 37ee3b8f49 is in history

Change-Id: I2c52e26c2d3635c66378c8c51f79608eb245add1
2019-07-15 11:03:54 -07:00
Jaewoong Jung
825c8143f5 Fix a bug in generateNoticeRule.
A $ sign was missing in some commands, which caused an error to mac
builds.

Test: TreeHugger
Fixes: 137364089
Change-Id: Iabd03ed4053d1179fa65a66d1615fcdf279fba12
2019-07-15 11:03:22 -07:00
Dan Shi
40c0afeb7c Support require_root in auto-gen test configs
require_root is added to allow auto-generated test config to include
RootTargetPreparer so the test runs with root permission.

Bug: 134509111
Bug: 136633978
Test: add "require_root: true" to init_benchmarks and libpower_test
  build the modules, confirm the extra target preparer is added in the
  test configs.

Change-Id: Ia07503e338935d6aa92560e7cf7b18d2a4c51243
Merged-In: Ia07503e338935d6aa92560e7cf7b18d2a4c51243
2019-07-15 17:31:17 +00:00
Jooyung Han
12df5fb471 soong: Fix AndroidMk with *Required properties
java.Module is using "Custom" function to write Android.mk.
And if "hostdex" is set to "true", it writes "hostdex" module definition
as well as original module.

As of now, Required/Host_required/Target_required props are filled in
the AndroidMkEntries structure(aosp/939505). But these are not
passed to old AndroidMkData.Custom function.

So, if a java_library declares "hostdex:true" and "required:[...]"
together, "required" is not applied to the "hostdex" variant.

This change copies *Required props from AndroidMkEntries to
AndroidMkData before calling its Custom callback.

Test: m (runs soong unit tests)
Change-Id: I5f85714f721a2a0917ab18072dbea52294c770e7
2019-07-16 02:28:29 +09:00
Jiyong Park
53554e2559 Fix the unbundled mainline module build
This change fixes two problems:

1) the prebuilt apexes are force disabled for the unbundled builds
because we need to build the modules from the source then

2) the dependencies from an sdk_library module to
*.stubs.{public|system|tests} are not added for the unbundled build
because the stubs modules are disabled.

Bug: 137282010
Test: unbundled mainline builds are successful
Test: build com.android.media and inspect the jar file to see if
hiddenapi flags are there
$ cd out/dist/mainline_modules_arm
$ unzip com.android.media.apex apex_payload.img
$ mkdir -p mnt
$ sudo mount -o ro,loop apex_payload.img mnt
$ dexdump2 mnt/javalib/updatable-media.jar | grep hiddenapi
shows results

Merged-In: I2c00af07aac4a15770d3acab011a36e2e4803bfc
Change-Id: I2c00af07aac4a15770d3acab011a36e2e4803bfc
2019-07-15 17:21:20 +09:00
Jiyong Park
716828ab4e Revert "Don't build hiddenapi flags or encode dex for unbundled builds"
This reverts commit 7b8a567f44.

Bug: 137282010
Test: With the CL above this one, the unbundled mainline module build
does not fail.

Merged-In: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
2019-07-15 17:20:47 +09:00
Jiyong Park
e3ef3c8f0c Fix the unbundled mainline module build
This change fixes two problems:

1) the prebuilt apexes are force disabled for the unbundled builds
because we need to build the modules from the source then

2) the dependencies from an sdk_library module to
*.stubs.{public|system|tests} are not added for the unbundled build
because the stubs modules are disabled.

Bug: 137282010
Test: unbundled mainline builds are successful
Test: build com.android.media and inspect the jar file to see if
hiddenapi flags are there
$ cd out/dist/mainline_modules_arm
$ unzip com.android.media.apex apex_payload.img
$ mkdir -p mnt
$ sudo mount -o ro,loop apex_payload.img mnt
$ dexdump2 mnt/javalib/updatable-media.jar | grep hiddenapi
shows results

Change-Id: I2c00af07aac4a15770d3acab011a36e2e4803bfc
2019-07-15 17:20:05 +09:00
Jiyong Park
09cb629c15 Revert "Don't build hiddenapi flags or encode dex for unbundled builds"
This reverts commit 7b8a567f44.

Bug: 137282010
Test: With the CL above this one, the unbundled mainline module build
does not fail.

Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
2019-07-15 17:17:31 +09:00
Jiyong Park
50b81e532b Don't use APEX prebuilts when asan is on
Some prebuilt APEXes are enabled with scudo, which causes crash on
devices with asan.

Bug: 137216042
Test: build walleye_hwasan and check if apexes are not from prebuilts
Merged-In: Ic436ad06e724af952d99fb8e66358a595450eb84
(cherry picked from commit 3b98a509f1)
Change-Id: Ic436ad06e724af952d99fb8e66358a595450eb84
2019-07-15 17:17:31 +09:00
Elliott Hughes
40f658296c Merge "Stop defining unused USE_SSSE3." am: b940a1499b am: 0a4996eae5
am: f095f970d1

Change-Id: I479a9fafce7f5788ea91d70f0fa869de64c3bee1
2019-07-13 10:40:31 -07:00
Elliott Hughes
f095f970d1 Merge "Stop defining unused USE_SSSE3." am: b940a1499b
am: 0a4996eae5

Change-Id: I4d4f9e92f201d9d8e62581756ab7b2505b7b5663
2019-07-13 10:32:30 -07:00
Elliott Hughes
0a4996eae5 Merge "Stop defining unused USE_SSSE3."
am: b940a1499b

Change-Id: I1ffdadb67b35ef899db10b49253f2c93073527c7
2019-07-13 10:23:29 -07:00
Treehugger Robot
b940a1499b Merge "Stop defining unused USE_SSSE3." 2019-07-13 16:59:49 +00:00
Elliott Hughes
b22dcfe05c Stop defining unused USE_SSSE3.
This copy & paste has even made it into the fuchsia configuration...

Test: builds
Change-Id: If22615fdf04448c058db014d93155e6264fb3eb2
2019-07-12 22:40:45 -07:00
Mitch Phillips
039403974e Merge "Re-enable ASAN globals instrumentation for devices." am: 68c9eed6b2 am: 88cddcf297
am: b580aec045

Change-Id: Ib5f4f47e25505158f646c1b4b8c693360e183a8f
2019-07-12 13:39:44 -07:00
Mitch Phillips
b580aec045 Merge "Re-enable ASAN globals instrumentation for devices." am: 68c9eed6b2
am: 88cddcf297

Change-Id: Ifdd4e3976f50ad7b7a626c333a9ac8a8ce17a062
2019-07-12 13:29:41 -07:00
Mitch Phillips
88cddcf297 Merge "Re-enable ASAN globals instrumentation for devices."
am: 68c9eed6b2

Change-Id: I8a29cd64cd1c9a60adcc1bc8858163a1589cc20e
2019-07-12 13:20:19 -07:00
Mitch Phillips
68c9eed6b2 Merge "Re-enable ASAN globals instrumentation for devices." 2019-07-12 19:44:29 +00:00