Commit Graph

17013 Commits

Author SHA1 Message Date
Ulyana Trafimovich a5bad9e22e Merge "Revert "Do not dexpreopt system server jars from updatable modules.""
am: 9d8dab57a5

Change-Id: Ib308c8e601dee141ab604bfcc1abc37504391deb
2019-11-26 05:19:56 -08:00
Ulyana Trafimovich 9d8dab57a5 Merge "Revert "Do not dexpreopt system server jars from updatable modules."" 2019-11-26 13:07:48 +00:00
Ulyana Trafimovich 01f6b0a656 Revert "Do not dexpreopt system server jars from updatable modules."
This reverts commit 61c325ebcc.

Reason for revert: broken build git_master/cf_x86_phone-userdebug_coverage (likely caused by these changes).

Exempt-From-Owner-Approval: revert.

Change-Id: I88ddd3af3a6c4ffdaa1fbb881d965356c5c75ad3
2019-11-26 13:06:38 +00:00
Ulyana Trafimovich fd88a29801 Merge "Do not dexpreopt system server jars from updatable modules."
am: 40227e55be

Change-Id: Ia868bd633a8a2bee15982c15c468e7f9662476bd
2019-11-26 02:26:35 -08:00
Ulyana Trafimovich 40227e55be Merge "Do not dexpreopt system server jars from updatable modules." 2019-11-26 10:18:02 +00:00
Steven Moreland 3443e7df09 Merge "vndkMustUseVendorVariantList += vintf-vibrator"
am: 16fc49db61

Change-Id: I5d7a0e775d39b206091c375c5517bbd33f8e7f74
2019-11-25 15:45:27 -08:00
Steven Moreland 16fc49db61 Merge "vndkMustUseVendorVariantList += vintf-vibrator" 2019-11-25 23:42:48 +00:00
Steven Moreland e7b5b72015 vndkMustUseVendorVariantList += vintf-vibrator
TARGET_VNDK_USE_CORE_VARIANT devices explicitly track libs which are
differentiated between system/vendor. b/145157349 is filed to try to
catch these errors during normal builds (or in presubmit).

aidl libs need to be differentiated because they explicitly set
different system/vendor stabilities.

Fixes: 145154788
Test: fixes build
Change-Id: I682ceaa2dd23f0f80ba060ae262d766b1367187e
2019-11-25 15:21:44 -08:00
Colin Cross dc5ae0ee6a Merge changes I0dcc9c7b,I9bc40642
am: 09ef474b6f

Change-Id: I70b1681c2af4d520eb70e80c02cbd00ccf2c3dc8
2019-11-25 14:42:19 -08:00
Colin Cross 09ef474b6f Merge changes I0dcc9c7b,I9bc40642
* changes:
  Move cc.imageMutator into the android package
  Make CreateVariations return []android.Module
2019-11-25 22:30:17 +00:00
Colin Cross 89169a36dd Make TestContext.RegisterModuleType take an android.ModuleFactory
am: 4b49b768a2

Change-Id: Ifdfcdcc3cbf58713bc16fa3f55dd5e2afe0e5943
2019-11-25 14:22:02 -08:00
Martin Stjernholm 49531ab73e Document the ":module{.tag}" syntax in a more visible place.
Taken from the comment for OutputFileProducer in android/module.go.

Test: n/a
Change-Id: If74e9072333ed2acd51e1019d5e756cf54c9e55e
2019-11-25 19:30:26 +00:00
Colin Cross 4b49b768a2 Make TestContext.RegisterModuleType take an android.ModuleFactory
Avoid having to pass ModuleFactoryAdaptor to every call to
RegisterModuleType in a test by wrapping RegisterModuleType.

Test: all soong tests
Change-Id: If8847d16487de0479cc3020b728256922b3cadba
2019-11-25 10:59:44 -08:00
Paul Duffin 1a88e1d863 Merge changes Ie274263a,I45993324
am: 62835fd85f

Change-Id: I60afce9c11ae2044be192eb3aa292d3ed3622c5c
2019-11-25 09:41:06 -08:00
Paul Duffin 62835fd85f Merge changes Ie274263a,I45993324
* changes:
  Adds droidstubs support to sdk module
  Simplify building an SDK snapshot from the command line
2019-11-25 17:32:53 +00:00
Ulya Trafimovich 61c325ebcc Do not dexpreopt system server jars from updatable modules.
Test: m

Test: The list of updatable system server jars is empty now,
  so I tested that the filer works with a manual experiment:
  - temporarily add ethernet-service to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
  - m nothing
  - fgrep -e 'ethernet-service' $ANDROID_BUILD_TOP/out/soong/build.ninja | grep dexpreopt
  - expect empty output (no dexpreopt command is generated)

Change-Id: I0b231e823d5a5a97632daa2b5eb7be3e06782004
2019-11-25 16:36:57 +00:00
Jaewoong Jung 492c2d1ba7 Fix Make modules name conflict for override_apex
am: 1670ca0d8b

Change-Id: I54ee55ddfdbcfd9bbfd598e0930d135c671b2973
2019-11-24 07:17:05 -08:00
Jaewoong Jung 1670ca0d8b Fix Make modules name conflict for override_apex
When an override_apex named Foo overrides an apex module named Bar, the
Make modules from Foo have Foo as their suffix. Previously the suffix
was Bar for both of the overriding and the overridden APEXes, causing
name conflicts in the Make side.

Bug: 144338929
Test: apex_test.go
Change-Id: I1396910ab294ba5f5e0585af6d37f1eab9460250
2019-11-23 16:20:50 +09:00
Jooyung Han d72d91c87f Merge "Make 'file_contexts' prop as `android:"path"`"
am: 9d78c66ac3

Change-Id: I145d4acb0809aaf775e33977d28c7e3a5982c065
2019-11-22 19:45:05 -08:00
Jooyung Han 9d78c66ac3 Merge "Make 'file_contexts' prop as `android:"path"`" 2019-11-23 03:37:33 +00:00
Roshan Pius 168c17e1e0 Merge "soong: Support system_server jars from apexes"
am: ac25dd3cb2

Change-Id: I062de456bd839a8c019353e15861796af41ecc25
2019-11-22 19:15:42 -08:00
Roshan Pius ac25dd3cb2 Merge "soong: Support system_server jars from apexes" 2019-11-23 03:09:35 +00:00
Evgenii Stepanov 64bee4decf Add -instcombine-lower-dbg-declare to hwasan flags.
This is a workaround to improve hwasan reports involving stack
variables.

Bug: 112437883
Test: SANITIZE_TARGET=hwaddress, build and boot

Change-Id: I21ea2fdd2d1f04e2bb9b9847785c00a951030c74
2019-11-22 18:40:07 -08:00
Colin Cross 7de9de871c Merge "Add GlobWithDeps to MakeVarsContext"
am: 3ea15b5a72

Change-Id: Ia5fd8513ec766fc936e9329ee25dc8da05ea0b88
2019-11-22 16:40:25 -08:00
Colin Cross 3ea15b5a72 Merge "Add GlobWithDeps to MakeVarsContext" 2019-11-23 00:29:12 +00:00
Roland Levillain 43fb1ffd94 Merge "Fix a typo in a comment in `android/module.go`."
am: 3351b33595

Change-Id: Ic85197ec7234fb532dbe06bbcfd78926e7ad8729
2019-11-22 13:48:00 -08:00
Roland Levillain 3351b33595 Merge "Fix a typo in a comment in `android/module.go`." 2019-11-22 21:13:43 +00:00
Paul Duffin 9154718303 Adds droidstubs support to sdk module
Adds stubs_sources property to sdk and unzips the droidstubs srcjar
into the snapshot directory.

Adds an UnzipToSnapshot method to the SnapshotBuilder which creates
a rule that uses zip2zip to repackage the supplied zip content into a
temporary zip file that matches what the required snapshot structure.
e.g. if the supplied zip contains foo/Foo.java and that needs to be in
the snapshot directory java/foo/stubs then it will create a zip that
contains java/foo/stubs/foo/Foo.java.

The temporary zip that is the output of that rule is added to the
zipsToMerge field for merging later.

If the zipsToMerge is empty then the snapshot zip is created as
before. Otherwise, a temporary zip file is created. That is then
merged with the other zip files in zipsToMerge to create the final
snapshot zip.

Adds prebuilt_stubs_sources for use by the generated .bp module.

Bug: 143678475
Test: added conscrypt sdk module and attempted to build it
Change-Id: Ie274263af3a08e36a73c61c0dbf0c341fd6967e2
2019-11-22 20:52:59 +00:00
Roshan Pius 9b51a4078a soong: Support system_server jars from apexes
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib.

Bug: 144722612
Bug: 141785760
Test: Compiles
Change-Id: Ia40bb91d2e05b2601a52eac28a985fe2d8da3481
2019-11-22 12:47:11 -08:00
Colin Cross 2d42ef51d2 Merge "Make fuzz rules reproducible"
am: 87847f7280

Change-Id: I9c12e9f0a3a12f0ea8f2847a7dfd9f2948ba95aa
2019-11-22 12:03:08 -08:00
Treehugger Robot 87847f7280 Merge "Make fuzz rules reproducible" 2019-11-22 19:09:42 +00:00
Paul Duffin 504b46160f Simplify building an SDK snapshot from the command line
Adds a phony target for each sdk module that builds the snapshot zip.

Test: built an sdk module from command line and checked the zip was created.
Bug: 143678475
Change-Id: I4599332443b8da9adea0a16f00f569ffbd421602
2019-11-22 14:52:29 +00:00
Roland Levillain 97c1f34067 Fix a typo in a comment in `android/module.go`.
Test: m
Change-Id: I1ea4e3ba70fc5f9e919495442ff94ab1e3b1fce2
2019-11-22 14:20:54 +00:00
Kyeongkab.Nam c49971469f Fix incorrect install path for priv-app prebuilt
Dexpreopted files for privleged app prebuilt(android_app_import) are
installed wrongly to /system/app.
To fix this issue, install path is changed to /system/priv-app
in the case that "privileged" flag is true.

Bug: 144945646
Test: build and check dexpreopted files of privileged app are
      installed to /system/priv-app

Change-Id: Iec140119f58179a3eb0feeff7af2699fcc855fe7
2019-11-22 13:36:21 +09:00
Jiyong Park 739e955b33 Merge changes I7642c57b,I2120b40e
am: 126c57b52d

Change-Id: Ie20dadc5c30ac3d519b9b65c22d32aae0a70f82c
2019-11-21 18:59:55 -08:00
Treehugger Robot 126c57b52d Merge changes I7642c57b,I2120b40e
* changes:
  apex uses the first arch variant of prebuilt_etc modules
  sh_binary prefer 32bit when TARGET_PREFER_32_BIT
2019-11-22 02:53:04 +00:00
Ivan Lozano 182163c499 Merge "Change stdlib linkage for C libraries."
am: bdebb171cc

Change-Id: Ib4d560623f4519cc66c8d7d71c954dfc02efc105
2019-11-21 18:44:59 -08:00
Ivan Lozano 239c81f2e0 Merge "Allow cc.LinkabeInterfaces to request "" variants."
am: 3bc70db398

Change-Id: I5ca3b585689be50367b792d1085946ab7cd69952
2019-11-21 18:44:43 -08:00
Jiyong Park e3dfb51c8c Merge "symbols in stub library isn't affected by -fvisibility=hidden"
am: 66278b6224

Change-Id: I45d66cc2e8eeec41c85b4973abbd67550aa2edbe
2019-11-21 18:38:27 -08:00
Ivan Lozano bdebb171cc Merge "Change stdlib linkage for C libraries." 2019-11-22 01:49:07 +00:00
Ivan Lozano 3bc70db398 Merge "Allow cc.LinkabeInterfaces to request "" variants." 2019-11-22 00:24:23 +00:00
Treehugger Robot 66278b6224 Merge "symbols in stub library isn't affected by -fvisibility=hidden" 2019-11-22 00:22:48 +00:00
Jaewoong Jung 41afdba365 Merge "Fix test app and helper installation dirs."
am: a21e9ddcf8

Change-Id: I9c318eb6cd6e67e9ef6788e7dce18bb4406bcf64
2019-11-21 15:26:24 -08:00
Treehugger Robot a21e9ddcf8 Merge "Fix test app and helper installation dirs." 2019-11-21 23:20:16 +00:00
Ivan Lozano 88f2b1ce53 Change stdlib linkage for C libraries.
Rust C libraries cannot currently depend on dylibs. This prevents device
libraries from attempting to link the stdlib dynamically, instead using
rlibs.

Bug: 144861059
Test: Simple Rust library compiles as a shared/static library.
Change-Id: I38e5aae90e50ddcc5fc72d5a8d1820d92955cf48
2019-11-21 14:45:33 -08:00
Ivan Lozano 2b26297dc7 Allow cc.LinkabeInterfaces to request "" variants.
cc.LinkableInterfaces should be able to request if an empty variant is
required from the LinkageMutator. We were previously assuming that if only
static or shared libraries were being built, then we didn't need the
empty variant. However this should be explicit to handle cases where the
default set of variants being created may not include both static and
shared libraries.

Bug: 144861059
Test: m -j crosvm.experimental
Change-Id: I66724bdc16ff350b06dfa4d049c82f33019979a5
2019-11-21 13:25:08 -08:00
Colin Cross dc809f9bc5 Make fuzz rules reproducible
Use lists instead of maps to make the order and contents of fuzz
packaging rules reproducible.

Test: m nothing; touch Android.bp; m nothing
Change-Id: Id11323f7528e594370c391bfe82eb7367bc1bcd5
2019-11-21 11:03:23 -08:00
Jaewoong Jung 326a9417ce Fix test app and helper installation dirs.
Fixes: 143902486
Test: app_test.go + m CtsIsolatedSplitApp
Change-Id: I3e1b8bf14cb9f440a6d8b0d2ac65525f00470cb8
2019-11-21 10:41:00 -08:00
Ivan Lozano 7f49786061 Merge "Add rust default compilation flags."
am: 0aa51a018b

Change-Id: I58403dc3f0d84919180c33f860ddf6cfa4f29b25
2019-11-21 10:15:33 -08:00
Ivan Lozano 0aa51a018b Merge "Add rust default compilation flags." 2019-11-21 17:45:45 +00:00