Commit graph

12954 commits

Author SHA1 Message Date
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
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
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
Colin Cross
ff0daf4ccf Fix sdk_version: "system_current" when Platform_sdk_final=true
When PLATFORM_VERSION_CODENAME is set to REL Platform_sdk_final
becomes true, which causes the return value of sdkVersionToNumber
for "system_current" to a real version number instead of
FutureApiLevel.  This enables the check against
PlatformSystemSdkVersions, which doesn't contain "current".  Use
the numeric value instead.

Fixes: 129786845
Test: sdk_test.go
Change-Id: If7cf211cc01c5fbf3e3ece3c3f604718a13d5a9b
2019-04-02 23:18:30 +00:00
Christopher Ferris
25bda7ea49 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
2019-04-02 15:31:29 -07:00
Colin Cross
caa0e1e341 Fix panic when missing hiddenapi jar
Fix a panic after reporting an error when a module is listed
in ProductHiddenAPIStubs but doesn't exist or doesn't produce
a dex jar.

Test: manual
Change-Id: I43643cbc5303536bfe0b02feedb03563ea0b540a
2019-04-02 13:03:46 -07:00
Colin Cross
6e5df47f16 Skip failing test on mac am: 9a4f3f7ea8 am: a9ff20226e
am: 0c39a64d3a

Change-Id: I12bedeced21bc8f8f6bba8b7ff20e7ed09cadaab
2019-04-02 11:07:14 -07:00
Colin Cross
0c39a64d3a Skip failing test on mac am: 9a4f3f7ea8
am: a9ff20226e

Change-Id: Ibd82f3d895774000a57ead77e987b2007beda076
2019-04-02 10:34:50 -07:00
Colin Cross
32762a08eb Add support for protoc plugins am: fe17f6f0e8 am: 91c063cfdc
am: 7299e418df

Change-Id: I30e57f6678343f57233831775b62afa1f043a450
2019-04-02 10:31:28 -07:00
Colin Cross
57205f3cb4 Move proto compilation to RuleBuilder am: 19878da6a0 am: 61918685aa
am: c8a3eb9110

Change-Id: If3922ee1900d6f3888c7291997ac49d4a939c065
2019-04-02 10:31:13 -07:00
Colin Cross
a9ff20226e Skip failing test on mac
am: 9a4f3f7ea8

Change-Id: Ic9475bef508ba636528d17db5e17d739a734232b
2019-04-02 10:25:40 -07:00
Colin Cross
7299e418df Add support for protoc plugins am: fe17f6f0e8
am: 91c063cfdc

Change-Id: I7bda9f891c55b5ad4fa412952583af1e3764ffc3
2019-04-02 10:13:43 -07:00
Colin Cross
c8a3eb9110 Move proto compilation to RuleBuilder am: 19878da6a0
am: 61918685aa

Change-Id: I0cbb9ae4a408e8dd8316c41c7f2f3816da951364
2019-04-02 10:13:31 -07:00
Colin Cross
9a4f3f7ea8 Skip failing test on mac
Tests with cc_binary_host fail on mac, disable for now.

Bug: 129763458
Test: TestProto
Change-Id: Icea24ac6ffba4c5c047296cb3997a5efa95e16ee
2019-04-02 10:02:04 -07:00
Colin Cross
91c063cfdc Add support for protoc plugins
am: fe17f6f0e8

Change-Id: I7dabf4b788925fce8b477eb3c7f9e90a5f986945
2019-04-02 09:55:06 -07:00
Colin Cross
61918685aa Move proto compilation to RuleBuilder
am: 19878da6a0

Change-Id: I44eed0735702ea6fbef57753d8eec078ad3a131e
2019-04-02 09:54:59 -07:00
Colin Cross
fe17f6f0e8 Add support for protoc plugins
Add a proto.plugin property to allow specifying a custom protoc
plugin to generate the code.

Fixes: 70706119
Test: m am StreamingProtoTest
Change-Id: I1ecdd346284b42bbcc8297019d98d2cd564eb94c
2019-04-02 16:38:55 +00:00
Colin Cross
19878da6a0 Move proto compilation to RuleBuilder
Using blueprint.Rule for protoc commands was causing code duplication
because there was no good way to run the same protoc for cc, java and
python but then run custom source packaging steps for java and python.
Move most of the code into a common function that returns a
RuleBuilder, and then let java and python add their own commands at
the end of the rule.

Bug: 70706119
Test: All Soong tests
Test: m checkbuild
Change-Id: Ic692136775d273bcc4f4de99620ab4878667c83a
2019-04-02 16:38:47 +00:00
Patrice Arruda
6a40626601 Merge "Soong: Add synopsis to cc_prebuilt_* modules." am: 6e1c3faed5 am: 57522e4123
am: 5a4767e5d8

Change-Id: Ieefc6c2fdf520b7ec24a9f2a014fdd39adedf5c9
2019-04-02 08:24:12 -07:00
Colin Cross
a50a2464c6 Merge changes I7dd4ba7f,I7887a67a am: 92cc71606c am: 900574f0cd
am: 6c99a30bb7

Change-Id: If557897ed64ecdf8967299b5512392e5485767ae
2019-04-02 08:21:42 -07:00
Patrice Arruda
5a4767e5d8 Merge "Soong: Add synopsis to cc_prebuilt_* modules." am: 6e1c3faed5
am: 57522e4123

Change-Id: I5f7a326b95b51419dc0c5e80e952ec758618e74d
2019-04-02 08:20:08 -07:00
Colin Cross
6c99a30bb7 Merge changes I7dd4ba7f,I7887a67a am: 92cc71606c
am: 900574f0cd

Change-Id: Id39b1ad15d3beb89ba2fedfb41172a97690cb1ff
2019-04-02 08:17:31 -07:00
Patrice Arruda
57522e4123 Merge "Soong: Add synopsis to cc_prebuilt_* modules."
am: 6e1c3faed5

Change-Id: I57ffbbe82c03113fffbc2fa766f8a4517d684cb7
2019-04-02 08:16:04 -07:00
Colin Cross
900574f0cd Merge changes I7dd4ba7f,I7887a67a
am: 92cc71606c

Change-Id: I40617cda703787aca7cc85e18beb173182b04532
2019-04-02 08:13:18 -07:00