Inseob Kim
c012b19eb0
Merge "Attach global variables to Context" am: a1591ab08c
...
am: 66c5cac22b
Change-Id: Icaf7aa78580459fd76605ec66b5bbaac13a30c9e
2019-05-09 19:42:18 -07:00
Xin Li
23b109888b
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 7592444a02
-s ours
...
am: 7b7f45b3fc
-s ours
am skip reason: subject contains skip directive
Change-Id: I00d67823830448b451ebda4be9b63cf128674507
2019-05-09 19:33:55 -07:00
Inseob Kim
66c5cac22b
Merge "Attach global variables to Context"
...
am: a1591ab08c
Change-Id: I755960fab4c3b3b7f9e2075e6cd1538dfe112321
2019-05-09 17:34:42 -07:00
Xin Li
7b7f45b3fc
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
...
am: 7592444a02
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieeb5d3916b626045d4c53d8b4c5a03825550fd11
2019-05-09 17:30:02 -07:00
Xin Li
9696e57025
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: e0ec6c7f00
-s ours
...
am: f528ca60c9
-s ours
am skip reason: subject contains skip directive
Change-Id: I2c5c83fddc75c0bc713ffe599067160121ab2ab2
2019-05-09 17:12:15 -07:00
Xin Li
f528ca60c9
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
am: e0ec6c7f00
-s ours
am skip reason: subject contains skip directive
Change-Id: Id8321d46c435763de1b2fea98df76524f1df7892
2019-05-09 15:51:13 -07:00
Treehugger Robot
a1591ab08c
Merge "Attach global variables to Context"
2019-05-09 22:36:30 +00:00
Tao Bao
bde0d2c9e4
[automerger skipped] Merge "Make device_kernel_headers available to recovery and vendor" am: fcf9979aa7
...
am: 5a6e89d092
-s ours
am skip reason: change_id Ia5d7b1a97926acbe4ba89df26aeb66fac6bbb1ab with SHA1 1a3b62757c
is in history
Change-Id: Iea3e02e2561b97ea3ee1479815488e50ebdeb322
2019-05-09 15:32:35 -07:00
Xin Li
7592444a02
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
2019-05-09 22:05:50 +00:00
Tao Bao
5a6e89d092
Merge "Make device_kernel_headers available to recovery and vendor"
...
am: fcf9979aa7
Change-Id: I1900688e4088d3eab7f898c3f68a8f8945e4efbe
2019-05-09 14:25:25 -07:00
Tao Bao
fcf9979aa7
Merge "Make device_kernel_headers available to recovery and vendor"
2019-05-09 20:27:48 +00:00
Colin Cross
48b8a7379d
Merge "Fix dangling rules on aosp_cf_x86_phone" am: 11cd91dada
...
am: 48fcec3d03
Change-Id: I5f80ed7dcae514b7d8c4c0e31a2d023bb9d335fc
2019-05-09 09:31:46 -07:00
Colin Cross
48fcec3d03
Merge "Fix dangling rules on aosp_cf_x86_phone"
...
am: 11cd91dada
Change-Id: Ic528bc1b80e697f8736727a78d376606cbf38d8f
2019-05-09 09:27:40 -07:00
Xin Li
e0ec6c7f00
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
Bug: 131756210
Change-Id: I00db6c50910291f4b200e3d7d2942e367fe0c358
2019-05-09 09:27:02 -07:00
Treehugger Robot
11cd91dada
Merge "Fix dangling rules on aosp_cf_x86_phone"
2019-05-09 16:16:01 +00:00
Hridya Valsaraju
d61df5041e
Make device_kernel_headers available to recovery and vendor
...
This is required to build the recovery variant of boot control HAL.
Bug: 78793464
Test: make
Bug: 34254109
Change-Id: Ia5d7b1a97926acbe4ba89df26aeb66fac6bbb1ab
Merged-In: Ia5d7b1a97926acbe4ba89df26aeb66fac6bbb1ab
(cherry picked from commit 1a3b62757c
)
2019-05-08 22:58:10 -07:00
Inseob Kim
9516ee9556
Attach global variables to Context
...
Global variables make testing difficult, and they should attached to
Context.
Bug: N/A
Test: m
Change-Id: Ic671dda755e99d036c7ddce0eed114496374d7ec
2019-05-09 12:29:58 +09:00
Dan Willemsen
7c3d86962b
Merge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY" am: ffff95bc4e
...
am: 570df4b7b9
Change-Id: I5684f3d2d58272557ac624f4525bdf509841cf1f
2019-05-08 17:55:23 -07:00
Jaewoong Jung
726fd0dc35
Merge "Implement DPI variants in android_app_import." am: 53ad63c127
...
am: a64eb7eada
Change-Id: Idcfca3ed5cbeb4955958d007ef701939cd3f26ae
2019-05-08 17:54:56 -07:00
Dan Willemsen
570df4b7b9
Merge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY"
...
am: ffff95bc4e
Change-Id: I224b1245731adaa25670613a42deedc901229f8d
2019-05-08 17:10:53 -07:00
Jaewoong Jung
a64eb7eada
Merge "Implement DPI variants in android_app_import."
...
am: 53ad63c127
Change-Id: I31388577fa67e0d1583a9b58f89c5f56bd223588
2019-05-08 17:10:33 -07:00
Treehugger Robot
ffff95bc4e
Merge "Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY"
2019-05-08 23:44:47 +00:00
Jaewoong Jung
53ad63c127
Merge "Implement DPI variants in android_app_import."
2019-05-08 23:34:04 +00:00
Colin Cross
c1643e32a4
Merge "Support android_robolectric_test with merged binary resources" into qt-dev-plus-aosp
2019-05-08 23:21:33 +00:00
Colin Cross
c11e0c5a39
Fix dangling rules on aosp_cf_x86_phone
...
aosp_cf_x86_phone uses SecondArchIsTranslated, which was leaving
a dangling rule from the oatdump rules to
out/soong/vsoc_x86/dex_bootjars/system/framework/arm/boot.art.
Consolidate the code to select targets for dexpreopting and use it
in more places to prevent references to boot images that were not
generated.
Test: m checkbuild
Change-Id: Ia4945a99ff5e575e759299106559c85f38489acc
2019-05-08 22:26:14 +00:00
Dan Willemsen
7e52fa9f33
Don't dump BUILD_BROKEN_USES_BUILD_[HOST_]SHARED_TEST_LIBRARY
...
These have been errors for years, and are now marked as obsolete.
Test: treehugger
Change-Id: I8055ab689ce5085df763378ad40d9b9aaa7ca85b
2019-05-08 12:38:49 -07:00
Jaewoong Jung
a5e5abc449
Implement DPI variants in android_app_import.
...
Bug: 128610294
Test: app_test.go
Change-Id: Ie3e558bfdb40de6b0b9df95d3b373d08a4084d7b
2019-05-07 17:55:23 -07:00
Yi Kong
26349f0d58
[automerger skipped] Merge changes from topic "libgcc_stripped" into qt-dev
...
am: 57b77658bc
-s ours
am skip reason: change_id Icc0d50e403dc4a3592e5bf389101cdef129042df with SHA1 3d8792f7dd
is in history
Change-Id: Icc45be43cb5a92c9fd21a90343488546ef302979
2019-05-07 14:35:22 -07:00
Yi Kong
6e408654d5
[automerger skipped] Exclude libgcc_stripped wherever libgcc is excluded
...
am: 94b9b2655d
-s ours
am skip reason: change_id Icc0d50e403dc4a3592e5bf389101cdef129042df with SHA1 3d8792f7dd
is in history
Change-Id: Ic84b9d2dd9d4fb6d9104b18369f5ad7b87e8c00e
2019-05-07 14:34:40 -07:00
Yi Kong
57b77658bc
Merge changes from topic "libgcc_stripped" into qt-dev
...
* changes:
Exclude libgcc_stripped wherever libgcc is excluded
Revert "Revert "Strip libgcc to only keep fallback symbols""
2019-05-07 21:13:04 +00:00
Yi Kong
94b9b2655d
Exclude libgcc_stripped wherever libgcc is excluded
...
Test: manual testing
Bug: 130267141
Bug: 29275768
Change-Id: Idbe82ea4a3e5cb9a9a7c194dd0a4d8a282d56c03
Merged-In: Icc0d50e403dc4a3592e5bf389101cdef129042df
(cherry picked from commit 3d8792f7dd
)
2019-05-07 21:12:49 +00:00
Yi Kong
b0e95c1e60
Revert "Revert "Strip libgcc to only keep fallback symbols""
...
This reverts commit 619cd098b6
.
Test: manual testing
Bug: 130267141
Change-Id: Ie156d4a3255be0ad082cda35c22bac4359852f22
Merged-In: I5b349fa6138e51663bf3b67109b880b4356da8e8
Exempt-From-Owner-Approval: Cherry pick
2019-05-07 21:11:31 +00:00
Colin Cross
3ec27ec6cf
Support android_robolectric_test with merged binary resources
...
android_robolectric_test with merged binary resources
requires a gnerated test_config.properties file pointing
to the APK containing binary resources.
Test: m RunSettingsLibRoboTests
Change-Id: Ic84714c09ea1bae70537556c8385405fe392f79f
2019-05-07 11:15:46 -07:00
Colin Cross
2146d5642d
Merge "Track sources for srcjars across modules" am: 082640d6ee
...
am: 222f5ee5f2
Change-Id: I1787ef4d66ebd129a15536b1455139235613ce2c
2019-05-07 10:43:23 -07:00
Colin Cross
222f5ee5f2
Merge "Track sources for srcjars across modules"
...
am: 082640d6ee
Change-Id: Ia5505e67614e1531acd9fed44491faef4596a62c
2019-05-07 10:38:18 -07:00
Treehugger Robot
082640d6ee
Merge "Track sources for srcjars across modules"
2019-05-07 17:25:52 +00:00
Colin Cross
1cd8159cd3
Merge "Allow module types to generate resources" am: da2bba1d71
...
am: 04c69f1c9d
Change-Id: I4b3b77e49bd2e9d7fe22a97d52131da0a9a4e598
2019-05-07 09:45:00 -07:00
Yi Kong
fcd11c7c71
Merge "Exclude libgcc_stripped wherever libgcc is excluded" am: 3277c39c6b
...
am: 29ae56ede9
Change-Id: Iaeb5531631c175af08b2e0d96dfccd4ad25ea080
2019-05-07 09:42:38 -07:00
Colin Cross
04c69f1c9d
Merge "Allow module types to generate resources"
...
am: da2bba1d71
Change-Id: I0ad142dadec08bd50ab8fdaa1f6dada0bf24a069
2019-05-07 07:36:39 -07:00
Treehugger Robot
da2bba1d71
Merge "Allow module types to generate resources"
2019-05-07 14:19:52 +00:00
Yi Kong
29ae56ede9
Merge "Exclude libgcc_stripped wherever libgcc is excluded"
...
am: 3277c39c6b
Change-Id: Idbe82ea4a3e5cb9a9a7c194dd0a4d8a282d56c03
2019-05-06 20:13:01 -07:00
Yi Kong
3277c39c6b
Merge "Exclude libgcc_stripped wherever libgcc is excluded"
2019-05-07 02:57:24 +00:00
Patrice Arruda
d2e1149cc5
resolve merge conflicts of a3898089ba
to qt-dev-plus-aosp
...
Bug: None
Test: Ran soong_ui.bash which compiles the soong_ui.
Change-Id: I0b8083e3e5ee69c8cbf17443fbc038ec7b5a0b10
2019-05-06 19:24:32 -07:00
Patrice Arruda
a3898089ba
Merge "Soong: Refactor the soong_ui arguments processing to be more like bazel."
...
am: 565ee6ed87
Change-Id: I4dd6ef7ac341857201969a830d8caf76e28cdfd5
2019-05-06 18:32:11 -07:00
Treehugger Robot
565ee6ed87
Merge "Soong: Refactor the soong_ui arguments processing to be more like bazel."
2019-05-07 00:49:21 +00:00
Yi Kong
3d8792f7dd
Exclude libgcc_stripped wherever libgcc is excluded
...
Test: manual testing
Bug: 130267141
Bug: 29275768
Change-Id: Icc0d50e403dc4a3592e5bf389101cdef129042df
2019-05-06 16:18:33 -07:00
Jaewoong Jung
514fd602b9
Merge "uncompressedDex option for android_app_import." am: ddda3ce23a
...
am: 6538ed7e72
Change-Id: I30230e28afd58c132049efa50b0aaee2ab6a57be
2019-05-06 14:42:25 -07:00
Jaewoong Jung
6538ed7e72
Merge "uncompressedDex option for android_app_import."
...
am: ddda3ce23a
Change-Id: I61d3cefceae2d53839477c65a15e69f4e863b952
2019-05-06 14:37:09 -07:00
Jaewoong Jung
ddda3ce23a
Merge "uncompressedDex option for android_app_import."
2019-05-06 21:24:53 +00:00
Colin Cross
0c4ce21615
Track sources for srcjars across modules
...
Robolectric coverage needs a srcjar that sometimes needs to
include sources of dependencies. Track the arguments and
dependencies necessary to jar the sources.
Test: TestIncludeSrcs
Change-Id: I9979d2b8350923a2237e743c232e6e548f54ba3b
2019-05-06 14:22:26 -07:00