Commit Graph

12968 Commits

Author SHA1 Message Date
TreeHugger Robot 5e037c38d3 Merge "Export more config variables" into qt-dev 2019-04-12 17:24:18 +00:00
TreeHugger Robot 353222b81d Merge "Fix package path of android/soong/android pctx" into qt-dev 2019-04-12 17:24:18 +00:00
Dan Willemsen 898efa15a1 Expose TargetFSConfigGen to DeviceConfig from Make
Bug: 118089258
Test: m oemaids_header_gen oemaids_headers
Change-Id: I2675822ae01af9bbec70f0c0413c047f36b5e024
Merged-In: I2675822ae01af9bbec70f0c0413c047f36b5e024
(cherry picked from commit 71c7460713)
2019-04-11 16:42:06 -07:00
TreeHugger Robot cdec2035fd Merge "Fix python proto srczip argument order" into qt-dev 2019-04-11 22:46:25 +00:00
Christopher Ferris 8f8b1f1746 Merge "Do not re-export _Unwind_XXX symbols." into qt-dev 2019-04-11 22:20:04 +00:00
Colin Cross 5599d79117 Fix python proto srczip argument order
-P has to come before -D to have an effect on the files read from the
directory.

Fixes: 130160833
Test: atest acloud_test
Change-Id: I62a998f1ad1e3b45f590babbf39330955d368373
Merged-In: I62a998f1ad1e3b45f590babbf39330955d368373
(cherry picked from commit 09364fd955)
2019-04-11 14:13:43 -07:00
Colin Cross 8e84648a63 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-11 10:54:18 -07:00
Christopher Ferris cf78867417 Do not re-export _Unwind_XXX symbols.
Bug: 130267141

Test: All system shared libraries do not contain global _Unwind_XXX symbols.
Change-Id: I79673753bb8197041bfe8ffb016d9f5fdf4cada5
2019-04-10 19:23:47 -07:00
Colin Cross 713ef2b424 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").

Bug: 130298888
Test: m checkbuild
Change-Id: I20d096522760538f7cfc2bec3d4bfeba99b275d4
2019-04-10 16:49:27 -07:00
Dan Willemsen 5584699125 Include proper deps for signapk
Bug: 130111713
Test: run signapk remotely, action succeeds after this change
Change-Id: I1670a27341591e0762cdfb42bcf424f065837192
Merged-In: I1670a27341591e0762cdfb42bcf424f065837192
(cherry picked from commit c4bd8f8282)
2019-04-10 12:21:09 -07:00
Dan Willemsen 479465691f Add BUILD_BROKEN_USES_NETWORK
Some people apparently still talk to the network during their build.
Allow this temporarily with a BUILD_BROKEN_USES_NETWORK check.

Bug: 129992021
Test: attempt to talk to the network during the build with and without
      this flag.
Change-Id: Ifb967c656aa24c4599e7232d0f1b5a303b5bac52
Merged-In: Ifb967c656aa24c4599e7232d0f1b5a303b5bac52
(cherry picked from commit 25e6f09c06)
2019-04-09 21:52:45 -07:00
Elliott Hughes b504727453 Merge "Add toybox seq." into qt-dev 2019-04-09 20:39:09 +00:00
Elliott Hughes 4873a11e40 Add toybox seq.
Bug: https://issuetracker.google.com/129992021
Bug: http://b/130214771
Test: builds

(cherry picked from commit c2dbadc363)

Change-Id: I1b53d3bc985932075abcb55c1483ac6156b86468
Merged-in: I63d5b3fd1c71b771e995638094ee4310435105ee
2019-04-09 18:03:02 +00:00
Vladimir Marko 96f7be168e Merge "Check package restrictions for Java libs." into qt-dev 2019-04-09 15:33:06 +00:00
Vladimir Marko e26f4a5e39 Check package restrictions for Java libs.
Test: m checkbuild; inspect verbose log.
Test: Manual - compile with unmet restrictions.
Bug: 122937705

(cherry picked from commit 0975ee0de3)

Change-Id: Ibecfb53072f060e046d3c8fdca0911d66cc6922d
Merged-In: I9360ae8b6d9ce016b7827be5e8ffc6eb521809b7
2019-04-09 10:04:53 +01:00
Nicolas Geoffray cd6abd83ee Use the full dexpreopt boot classpath when preopting with other images.
Bug: 119800099
Test: m

(cherry picked from commit 06758a7e13)

Change-Id: I60c154c3b3e2ab9b80ea9df0efa168ccd9efcc60
Merged-In: Ia9b34aa92ebb1b4de96ea0f8f290d798be19b2cf
2019-04-08 22:47:39 +01:00
Nikita Ioffe bed7cd3101 Make prebuilt_apex be usable via :modulename syntax
Test: m
Bug: 127789981
Bug: 128677967
Change-Id: Ie1a1147c1d5570cd7eda48e274faabf95566d53f
Merged-In: Ie1a1147c1d5570cd7eda48e274faabf95566d53f
(cherry picked from commit 89ecd590ea)
2019-04-08 09:48:58 +01:00
Nikita Ioffe ed75f61398 Add filename property to prebuilt_apex
* Makes it more inline with prebuilt_etc;
* For shim apexes, prebuilt_apex modules have pattern of
  com.android.apex.cts.shim.v1_prebuilt, but I would prefer
  pre-installed shim to be: /system/apex/com.android.apex.cts.shim.apex

Bug: 128677967
Bug: 127789981
Test: m
Change-Id: I34e3e078733420b5cf777fd6e3ce4d8c5796b19b
Merged-In: I34e3e078733420b5cf777fd6e3ce4d8c5796b19b
(cherry picked from commit 7a41ebdf5f)
2019-04-08 06:30:39 +01:00
Nikita Ioffe 03a31cc2cc Add installable property for prebuilt_apex
In case of shim apexes, we prebuilt all of them, but only need to
install v1 to a system partition.

Bug: 128677967
Test: manually checked that non-installable prebuilts don't end in /system
Change-Id: I112432abfd8f03cc7d7379ea3cab3f5491ace49c
Merged-In: I112432abfd8f03cc7d7379ea3cab3f5491ace49c
(cherry picked from commit dd53e8be18)
2019-04-06 11:30:10 +01: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
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