George Burgess IV
5522cbdde4
Merge "Remove our clang-tidy wrapper" am: 45a5a287af
...
am: ea2835bb72
Change-Id: Ibd66c5dd3850437948ba56682631338881468876
2019-04-05 18:27:39 -07:00
George Burgess IV
ea2835bb72
Merge "Remove our clang-tidy wrapper"
...
am: 45a5a287af
Change-Id: Ie120d7f322039f6b382769fb68fd1785b3902096
2019-04-05 17:17:25 -07:00
Treehugger Robot
45a5a287af
Merge "Remove our clang-tidy wrapper"
2019-04-05 21:58:36 +00:00
Nicolas Geoffray
ac4355402a
[automerger skipped] Use the apex image when the device config asks for it.
...
am: 0ebdd3430e
-s ours
am skip reason: change_id Id2fff6a4569d48b8e6a886cb82bdba205b0dd56a with SHA1 25c0e03520
is in history
Change-Id: I11d7fefe54e2d1ab692619ccd81b7d2a86aa785e
2019-04-05 10:16:28 -07:00
Nicolas Geoffray
fc0cc43da6
Merge "Use the apex image when the device config asks for it." am: 56405f8071
...
am: b32c872116
Change-Id: Ic40b3c44bc9c9d85f532878475f14489d5743069
2019-04-05 09:46:59 -07:00
Sasha Smundak
8b48326fbd
Merge "Implement host_required
and target_required
properties." am: b9045cf28c
...
am: 0e47e406de
Change-Id: I476551e94329a1703d9afddc6cb25e7311ac64ef
2019-04-05 08:34:46 -07:00
Nicolas Geoffray
0ebdd3430e
Use the apex image when the device config asks for it.
...
Test: lunch walleye_jitzygote-userdebug m && all odex file use the apex image
Bug: 119800099
(cherry picked from commit 25c0e03520
)
Change-Id: I901ed57136885f87470d1ee398b92972151547f2
Merged-In: Id2fff6a4569d48b8e6a886cb82bdba205b0dd56a
2019-04-05 13:57:47 +01:00
Nicolas Geoffray
b32c872116
Merge "Use the apex image when the device config asks for it."
...
am: 56405f8071
Change-Id: I2437500e947c47689eeebc7253b64b41939782eb
2019-04-05 02:56:43 -07:00
Nicolas Geoffray
56405f8071
Merge "Use the apex image when the device config asks for it."
2019-04-05 09:34:34 +00:00
Sasha Smundak
0e47e406de
Merge "Implement host_required
and target_required
properties."
...
am: b9045cf28c
Change-Id: I1c53b3bd727e2eca85e0272e96572e56a1ac8d66
2019-04-04 22:12:06 -07:00
Treehugger Robot
b9045cf28c
Merge "Implement host_required
and target_required
properties."
2019-04-05 04:52:38 +00:00
George Burgess IV
c4624c0189
Remove our clang-tidy wrapper
...
Looks like the reason for it existing has been fixed. It should probably
just be removed.
Bug: None
Test: WITH_TIDY=1 m
Change-Id: I770b2fec4ac44f265ff31731c9c0bd4da14d5b0f
2019-04-04 17:58:00 -07:00
Patrice Arruda
69f5263d51
Merge "Soong: Add synopsis to vndk_prebuilt_shared module under cc package." am: fc453c79f2
...
am: efd2678e8c
Change-Id: I0d1d31f8bcfb0de7a93118641b182c28068a844b
2019-04-04 17:43:08 -07:00
Patrice Arruda
efd2678e8c
Merge "Soong: Add synopsis to vndk_prebuilt_shared module under cc package."
...
am: fc453c79f2
Change-Id: Ieffcdfeb0fe47af75b0344e0bb2428545ec120fe
2019-04-04 12:01:10 -07:00
Treehugger Robot
fc453c79f2
Merge "Soong: Add synopsis to vndk_prebuilt_shared module under cc package."
2019-04-04 18:51:11 +00:00
Sasha Smundak
b6d230515e
Implement host_required
and target_required
properties.
...
They are counterparts of LOCAL_HOST_REQUIRED_MODULES and
LOCAL_TARGET_REQUIRED_MODULES respectively.
Fixes: 128693436
Test: treehugger, convert cts/hostsidetests/devicepolicy/Android.bp
Change-Id: Id66ffca6edffe18993ac51e8930f1d0e78178249
2019-04-04 11:24:01 -07:00
Nicolas Geoffray
25c0e03520
Use the apex image when the device config asks for it.
...
Test: lunch walleye_jitzygote-userdebug m && all odex file use the apex image
Bug: 119800099
Change-Id: Id2fff6a4569d48b8e6a886cb82bdba205b0dd56a
2019-04-04 18:50:56 +01:00
Vic Yang
8f68cbd21d
Merge "Blacklist more libraries from no-vendor-variant VNDK" am: f3f1467051
...
am: fba522bd64
Change-Id: Iceb901408082e2a5b85bad18505f4a01c8abbaed
2019-04-04 08:58:20 -07:00
Vic Yang
fba522bd64
Merge "Blacklist more libraries from no-vendor-variant VNDK"
...
am: f3f1467051
Change-Id: Iba0a4248bfc4e72e470849e3878ca26d9d0906b0
2019-04-04 01:50:54 -07:00
Colin Cross
a51caadf4a
Export more config variables am: 092c9da922
...
am: 34998d71cd
Change-Id: I5acae0e9043089f1a86b013e3cecb07c993eee10
2019-04-04 01:40:10 -07:00
Colin Cross
11fbb890c9
Fix package path of android/soong/android pctx am: cc0ce80ed5
...
am: a1c57b4664
Change-Id: Ifba10892f902e70bd0a52a82a20bd5f1b64a61de
2019-04-04 01:39:57 -07:00
Treehugger Robot
f3f1467051
Merge "Blacklist more libraries from no-vendor-variant VNDK"
2019-04-04 08:33:02 +00:00
Colin Cross
34998d71cd
Export more config variables
...
am: 092c9da922
Change-Id: I76076e031301dc4980a380edecc65fa600c907e3
2019-04-03 21:21:20 -07:00
Colin Cross
a1c57b4664
Fix package path of android/soong/android pctx
...
am: cc0ce80ed5
Change-Id: Ia266af299fe1a0c8b2f9467c845ceb61cb8236bc
2019-04-03 21:21:10 -07:00
Colin Cross
092c9da922
Export more config variables
...
Export some more config variables that will be used to generate
robolectric's build.prop file.
Bug: 122331577
Test: m checkbuild
Change-Id: I39f3436ed5d5c4e730dd3e1f86c840cf6358ec87
2019-04-04 03:59:41 +00:00
Colin Cross
cc0ce80ed5
Fix package path of android/soong/android pctx
...
android/soong/common was renamed to android/soong/android long
ago, but the pctx package path was still "android/soong/common".
This required all users of rules defined in android/soong/android
to import "android/soong/android" and then
pctx.Import("android/soong/common").
Test: m checkbuild
Change-Id: I20d096522760538f7cfc2bec3d4bfeba99b275d4
2019-04-04 03:59:34 +00:00
Christopher Ferris
c4bd0a2663
[automerger skipped] Make libc_scudo always go first. am: 134f8f6f00
am: 2000f21705
...
am: 90625f92d9
-s ours
am skip reason: change_id Ibdc5dbd019a382630a727c270f846aa4446f8d99 with SHA1 25bda7ea49
is in history
Change-Id: I0989111379ef821fd7faf728b8195ebd2b0d1ef8
2019-04-03 16:37:32 -07:00
Christopher Ferris
90625f92d9
Make libc_scudo always go first. am: 134f8f6f00
...
am: 2000f21705
Change-Id: Ie3fbc98f6f4b23ede09562635bae18bc24b6081a
2019-04-03 16:22:44 -07:00
Bill Rassieur
03a6f4c865
Merge master@5406228 into git_qt-dev-plus-aosp.
...
am: 27d35885df
Change-Id: I5343bf76c8e5a7e58d6d5d30cf6db1f6e40f8050
2019-04-03 16:11:58 -07:00
Christopher Ferris
2000f21705
Make libc_scudo always go first.
...
am: 134f8f6f00
Change-Id: Ib7b568406b3822ece9cf0825957d7a8b8ff6aa01
2019-04-03 16:09:15 -07:00
Christopher Ferris
134f8f6f00
Make libc_scudo always go first.
...
In addition, add Shared_libs to malloc_not_svelte.
Bug: 123689570
Test: Verified that libc_scudo is first wherever it is added.
Change-Id: Ibdc5dbd019a382630a727c270f846aa4446f8d99
Merged-In: Ibdc5dbd019a382630a727c270f846aa4446f8d99
2019-04-03 14:54:12 -07:00
Colin Cross
49c87dfae9
Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true" am: b007b2bde5
am: 8c3f398c6c
...
am: 209edee425
Change-Id: I54ea846c9ac2b29354109755225db71dcdaa1527
2019-04-03 14:04:07 -07:00
Christopher Ferris
673f43b05f
Merge "Make libc_scudo always go first."
2019-04-03 20:44:41 +00:00
Colin Cross
209edee425
Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true" am: b007b2bde5
...
am: 8c3f398c6c
Change-Id: Ic3265e231d497b973d2747b59c567f089135321c
2019-04-03 11:56:28 -07:00
Colin Cross
8c3f398c6c
Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true"
...
am: b007b2bde5
Change-Id: Ic25cf990d32975fabaef3b94c57f307d69d35d5d
2019-04-03 11:46:23 -07:00
Colin Cross
b007b2bde5
Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true"
2019-04-03 18:40:09 +00:00
Dan Willemsen
f16fe206d4
Merge "Support host phony modules" am: 3bdefa9f06
am: 7aafa96cda
...
am: d005765856
Change-Id: Ia0417704e8c48f6413c8a6fa52ee0750c6f24081
2019-04-03 11:09:31 -07:00
Dan Willemsen
d005765856
Merge "Support host phony modules" am: 3bdefa9f06
...
am: 7aafa96cda
Change-Id: I2a7b8e25c83673a82246e333109b2ce827f2c317
2019-04-03 11:04:13 -07:00
Dan Willemsen
7aafa96cda
Merge "Support host phony modules"
...
am: 3bdefa9f06
Change-Id: Icd5cb89744d4d94bf53b839f3f29316ca04f9a54
2019-04-03 10:55:08 -07:00
Treehugger Robot
3bdefa9f06
Merge "Support host phony modules"
2019-04-03 17:48:01 +00:00
Patrice Arruda
ad0315089c
Soong: Add synopsis to vndk_prebuilt_shared module under cc package.
...
Added vndk_prebuilt_shared synopsis.
Bug: b/128337482
Test: Generated the documentation and verified that the synopsis
was added to the vndk_prebuilt_shared module.
Change-Id: Id40246de65985b8b3b357744083c1d32c872e2ff
2019-04-03 09:07:51 -07:00
Colin Cross
bf9f355f8d
Merge "Fix panic when missing hiddenapi jar" am: f5df780fc2
am: f5a8e0e88d
...
am: c2c2824ff9
Change-Id: I358685842ca77c435a02b52bf2b278a841a51808
2019-04-03 07:23:30 -07:00
Colin Cross
c2c2824ff9
Merge "Fix panic when missing hiddenapi jar" am: f5df780fc2
...
am: f5a8e0e88d
Change-Id: Id434ff90e8e23a84d751ce1dfb5ec674b3434333
2019-04-03 07:18:26 -07:00
Colin Cross
f5a8e0e88d
Merge "Fix panic when missing hiddenapi jar"
...
am: f5df780fc2
Change-Id: Ic21f9edcd54368477d68124a5cbd56b32a945b0c
2019-04-03 07:14:23 -07:00
Treehugger Robot
f5df780fc2
Merge "Fix panic when missing hiddenapi jar"
2019-04-03 13:53:46 +00:00
Josh Gao
2a5d962ab8
Revert "Enable lld for windows" am: 61166dc047
am: 87fd9dec38
...
am: 2278b4ea57
Change-Id: I34146cab38c87a85b981eaa4102bab99e626298e
2019-04-02 22:03:25 -07:00
Josh Gao
2278b4ea57
Revert "Enable lld for windows" am: 61166dc047
...
am: 87fd9dec38
Change-Id: I0f9345529010c691cd86af3a63c9723e740b8c64
2019-04-02 21:06:08 -07:00
Josh Gao
87fd9dec38
Revert "Enable lld for windows"
...
am: 61166dc047
Change-Id: Ib2088c56f593472c41efcf69ef0ae309db95cd9a
2019-04-02 20:45:04 -07:00
Josh Gao
61166dc047
Revert "Enable lld for windows"
...
This reverts commit 3c21c0b1d9
.
Reason for revert: appears to break AdbWinUsb.dll usage by fastboot (and adb?)
Bug: http://b/129420419
Bug: http://b/110800681
Change-Id: I36d6d87f2e830e08e257ab42d470e49cdbb95819
2019-04-03 00:59:14 +00:00
Dan Willemsen
60294ef8d5
Support host phony modules
...
I'm fixing make to differentiate between host and target, so this will
be more useful soon.
Test: Android-aosp_arm64.mk is the same before/after
Test: adding `host_supported: true` to shell_and_utilities_system produces expected Android-aosp_arm64.mk
Change-Id: Idf12703be692100336db6d5c0ec05bb96e5e5c27
2019-04-02 17:07:10 -07:00