StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,108 Commits 1 Branch 0 Tags
393b394b854aa4555e036da2fb5e880ab9d0952c
Commit Graph

31108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
393b394b85 Merge "Remove global state from apex modules" am: 43159bd1b7 am: 21bb1d491c am: 2c76247f51 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1428815

Change-Id: I931b01c9ec6905698fef4fbbbdee47224291186e
 2020-10-07 19:51:03 +00:00
Colin Cross
2c76247f51 Merge "Remove global state from apex modules" am: 43159bd1b7 am: 21bb1d491c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1428815

Change-Id: I92cddf406596dee989f4794b75c3865f71206c79
 2020-10-07 19:17:02 +00:00
Colin Cross
21bb1d491c Merge "Remove global state from apex modules" am: 43159bd1b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1428815

Change-Id: I9ddb389c6a107e7431ba761c58b0ab99048fbc11
 2020-10-07 19:05:15 +00:00
Paul Duffin
9c3caa7815 Merge "Allow access to the class jar for java_import using {.jar} tag" am: a87ea4587d am: d8c90a7e8d am: ee7a67ae65 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450820

Change-Id: I583b461c34522a3573081ec7e3f3c9f7375065e7
 2020-10-07 18:24:38 +00:00
Paul Duffin
ee7a67ae65 Merge "Allow access to the class jar for java_import using {.jar} tag" am: a87ea4587d am: d8c90a7e8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450820

Change-Id: I9ff609ebd07150d85e18106679c90928b547fbd5
 2020-10-07 18:08:30 +00:00
Colin Cross
43159bd1b7 Merge "Remove global state from apex modules" 2020-10-07 17:58:00 +00:00
Paul Duffin
d8c90a7e8d Merge "Allow access to the class jar for java_import using {.jar} tag" am: a87ea4587d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450820

Change-Id: I32200cbb541524bd73ba6695ace4b21162914529
 2020-10-07 17:30:59 +00:00
Paul Duffin
a87ea4587d Merge "Allow access to the class jar for java_import using {.jar} tag" 2020-10-07 17:16:43 +00:00
Tom Cherry
1a26aa1d7b Merge "Reland: "Include system/core/liblog/include instead of using symlinks"" am: a5e9be9476 am: 320a70915c am: 7f7d71d898 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1451057

Change-Id: I69b9cfc5941a497e1eebf160eceaedbdd41f3c9e
 2020-10-07 16:03:40 +00:00
Tom Cherry
7f7d71d898 Merge "Reland: "Include system/core/liblog/include instead of using symlinks"" am: a5e9be9476 am: 320a70915c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1451057

Change-Id: I6c079081a83123b4e404a654289f3dd498cc14c2
 2020-10-07 15:51:53 +00:00
Tom Cherry
320a70915c Merge "Reland: "Include system/core/liblog/include instead of using symlinks"" am: a5e9be9476 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1451057

Change-Id: Id25b73231d03002301bd34e6e9127b26bf442404
 2020-10-07 15:38:09 +00:00
Tom Cherry
a5e9be9476 Merge "Reland: "Include system/core/liblog/include instead of using symlinks"" 2020-10-07 15:11:10 +00:00
Anton Hansson
5bcaacc636 Merge "Add outputfiles tags for droidstubs api txts" am: 70bc545407 am: c9e7c18c40 am: 2eca928722 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1446800

Change-Id: I408f5f5f9f0b3b3dac0329c2970a4401fda1f8cc
 2020-10-07 10:56:42 +00:00
Anton Hansson
2eca928722 Merge "Add outputfiles tags for droidstubs api txts" am: 70bc545407 am: c9e7c18c40 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1446800

Change-Id: I93e489fd42c6addd9f0aedae17d8bb1d8340d908
 2020-10-07 10:18:32 +00:00
Ulyana Trafimovich
b25df83dfe Merge changes from topic "uses-libs-24" am: 9f701fa348 am: 2b45163773 am: 8a61f3ca89 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1435492

Change-Id: If1a92010f50f73ac2ec6e4ce3d7d431da004d8f5
 2020-10-07 10:02:42 +00:00
Anton Hansson
c9e7c18c40 Merge "Add outputfiles tags for droidstubs api txts" am: 70bc545407 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1446800

Change-Id: Ib526b1cb47f0900900cb028011c864eb77e192c4
 2020-10-07 10:00:19 +00:00
Anton Hansson
70bc545407 Merge "Add outputfiles tags for droidstubs api txts" 2020-10-07 09:54:43 +00:00
Ulyana Trafimovich
8a61f3ca89 Merge changes from topic "uses-libs-24" am: 9f701fa348 am: 2b45163773 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1435492

Change-Id: Ifbad2e6ac83acc9a577c3633a597443503029ae7
 2020-10-07 09:49:28 +00:00
Ulyana Trafimovich
2b45163773 Merge changes from topic "uses-libs-24" am: 9f701fa348 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1435492

Change-Id: Ie4d034c7dd3bed313dc51671b8cb489f2e3f2d57
 2020-10-07 09:34:42 +00:00
Ulyana Trafimovich
9f701fa348 Merge changes from topic "uses-libs-24" 
* changes:
  Fail the build if dexpreopt cannot find path to a <uses-library>.
  Add dependency on implementation <uses-library> for modules that depend on component libraries.
 2020-10-07 09:18:02 +00:00
Martin Stjernholm
d4c1058ce5 Merge "Avoid conflicting shared libraries from SDK snapshots." am: 3c72ce8696 am: ff4181eba9 am: 091c1bd091 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450116

Change-Id: I8cb74650f4fa48876c1118935d2e72ab4b7e8311
 2020-10-07 01:02:43 +00:00
Martin Stjernholm
091c1bd091 Merge "Avoid conflicting shared libraries from SDK snapshots." am: 3c72ce8696 am: ff4181eba9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450116

Change-Id: I46f1c25e3405357483e525ece4c6f1e43652a2a1
 2020-10-07 00:00:57 +00:00
Martin Stjernholm
ff4181eba9 Merge "Avoid conflicting shared libraries from SDK snapshots." am: 3c72ce8696 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450116

Change-Id: Ic7fe39789b97f284799fce0b737b1070d5da3375
 2020-10-06 23:32:31 +00:00
Treehugger Robot
ca0091c763 Merge "Add allow rust rule for android.system.keystore2 vts tests." am: 614b06c8ce am: e0126b9038 am: e5d1609cce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1443715

Change-Id: I8b4f47f733c62107ebe6711f65e295b9a7cac10e
 2020-10-06 23:20:18 +00:00
Martin Stjernholm
3c72ce8696 Merge "Avoid conflicting shared libraries from SDK snapshots." 2020-10-06 22:55:34 +00:00
Treehugger Robot
e5d1609cce Merge "Add allow rust rule for android.system.keystore2 vts tests." am: 614b06c8ce am: e0126b9038 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1443715

Change-Id: Ib5771dde82e03e60fe5870ad781d117e021d2259
 2020-10-06 22:14:53 +00:00
Treehugger Robot
e0126b9038 Merge "Add allow rust rule for android.system.keystore2 vts tests." am: 614b06c8ce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1443715

Change-Id: I91b15aea954edcc31b9a3c68c8732fa34307b63f
 2020-10-06 21:49:40 +00:00
Treehugger Robot
7fc1aef3c1 Merge "Avoid panic when a boot jar is provided as a java_import" am: a8baa88424 am: 3641d82f7e am: f67292088a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450816

Change-Id: Id46c9ddfc217fd23d0912308dc075830c4f19d4d
 2020-10-06 21:47:46 +00:00
Treehugger Robot
614b06c8ce Merge "Add allow rust rule for android.system.keystore2 vts tests." 2020-10-06 21:03:42 +00:00
Treehugger Robot
f67292088a Merge "Avoid panic when a boot jar is provided as a java_import" am: a8baa88424 am: 3641d82f7e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450816

Change-Id: I6d4b77bde076e5bd1643c7ca36db11151785fc5a
 2020-10-06 20:54:17 +00:00
Colin Cross
56a8321c21 Remove global state from apex modules 
A global variant was used to store the global mapping between
modules and APEXes.  Replace it with storing pointers to APEX
contents inside each module so that they can query the contents
of any APEXes they belong to.

Bug: 146393795
Test: all Soong tests
Test: single line change to build.ninja host install dependency ordering
Test: no Android-${TARGET_PRODUCT}.mk, make_vars-${TARGET_PRODUCT}.mk or late-${TARGET_PRODUCT}.mk
Change-Id: Id2d7b73ea27f8c3b41d30820bdd86b65c539bfa4
 2020-10-06 13:39:57 -07:00
Treehugger Robot
3641d82f7e Merge "Avoid panic when a boot jar is provided as a java_import" am: a8baa88424 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450816

Change-Id: Ibbb8129ed2d43342815c1e5d7b8ac2a9baf64a2d
 2020-10-06 20:14:50 +00:00
Colin Cross
d2cab9dbf3 Merge changes I4c8cd544,I62d4d43d,I0ae667d4,Id357adc0,I1ff87134 am: ac0cd89283 am: d7f1653e7b am: b3f3a68d0f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1445698

Change-Id: I98a622348ead0ea28d10106600b28f0ec5ecbdc7
 2020-10-06 19:57:15 +00:00
Treehugger Robot
a8baa88424 Merge "Avoid panic when a boot jar is provided as a java_import" 2020-10-06 19:55:00 +00:00
Colin Cross
b3f3a68d0f Merge changes I4c8cd544,I62d4d43d,I0ae667d4,Id357adc0,I1ff87134 am: ac0cd89283 am: d7f1653e7b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1445698

Change-Id: If122f565cb4dff6c85204019f553f22cc17cb8a0
 2020-10-06 19:23:28 +00:00
Colin Cross
d7f1653e7b Merge changes I4c8cd544,I62d4d43d,I0ae667d4,Id357adc0,I1ff87134 am: ac0cd89283 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1445698

Change-Id: I3b3af12a19a2fa1a6f0496401b5051d3eb394a34
 2020-10-06 18:28:30 +00:00
Tom Cherry
6ddbb00e24 Reland: "Include system/core/liblog/include instead of using symlinks" 
It seems better to include this path directly rather than creating
symlinks in system/core that accomplish the same result.

Bug: 165825252
Test: treehugger
Change-Id: Ic78f09d86039540a2b0eead45e985b42c553f415
 2020-10-06 10:45:28 -07:00
Colin Cross
ac0cd89283 Merge changes I4c8cd544,I62d4d43d,I0ae667d4,Id357adc0,I1ff87134 
* changes:
  Don't create version variations of sdk modules
  Create fewer empty version variants
  Don't make SplitPerApiLevel imply UseSdk
  Remove vendor crt special case
  Fix apex_test.go and add it to Android.bp
 2020-10-06 17:33:30 +00:00
Stephen Hines
52403a589e [automerger skipped] Update to r383902b1. am: f9096bf63a -s ours 
am skip reason: Change-Id I34d26da72a36b16491cf328075d817b073acfc0d with SHA-1 5060c9e558 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12765813

Change-Id: I9661043198f97248779c36d8b9a57476c696a1e8
 2020-10-06 16:55:42 +00:00
Paul Duffin
aa55f74505 Allow access to the class jar for java_import using {.jar} tag 
Layoutlib requires access to the jar file (containing .class) files for
a number of libraries including "core-libart". It does that using the
{.jar} output tag, e.g. "core-libart{.jar}".

This change makes sure that works when "core-libart" is provided as a
java_import instead of a java_library.

Bug: 142938164
Test: m nothing
Change-Id: I605019d680c28e4a33f0ca14279d63fa62b9774b
 2020-10-06 17:48:37 +01:00
Paul Duffin
81febc4500 Avoid panic when a boot jar is provided as a java_import 
Bug: 142938164
Test: m nothing
Change-Id: I607009825f5946d7e1daa31dc1e4bb8f2609206d
 2020-10-06 16:54:02 +01:00
Ulya Trafimovich
a54d33be77 Fail the build if dexpreopt cannot find path to a <uses-library>. 
This doesn't apply to compatibility libraries (those added to
conditional class loader context base on the targetSdkVersion in the
manifest), because Soong doesn't know if they are needed or not (the
build rule that parses the manifest runs at Ninja stage).

In the future we may need to relax this and instead of failing the build
to disable dexpreopt in such cases. But currently there are no use cases
that fail.

Also, this patch replaces hardcoded install path with a constant.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: Ic894bc17e8ffd8ff173111ea09366252001ef3e9
 2020-10-06 14:04:49 +01:00
Ulya Trafimovich
39b437b25f Add dependency on implementation <uses-library> for modules that depend on component libraries. 
If a dexpreopted Java module depends on a component library (such as
stubs), it must be dexpreopted against the implementation library,
because that is what it will use at run time. Therefore dexpreopt needs
to know about the implementation library.

One of the subtests of TestUsesLibraries is removed. This is because the
subtest was previosuly split in two variants with the only difference
that the first variant had dependency on a stubs library, and the second
one had dependency on the implementation. The latter caused dexpreopt to
be disabled because Soong couldn't find the implementation (it had only
the name, but no access to the module). Now that there is a dependency
on the implementation, the problem goes away and the two subtest
variants can be merged into one.

Add a method for getting the name of the implementation library for the
optional SDK library. Currently it is the same as the SDK library name,
but it may change in future.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I584df4b6db874c7ae3c478231fc51572a46929b1
 2020-10-06 14:04:49 +01:00
Anton Hansson
ecf5435590 Add outputfiles tags for droidstubs api txts 
These can then easily be used in genrules to merge txt files.

Bug: 169034951
Test: m combined-dex-api
Change-Id: Id49739c90a2ab52a72094b76696a4e5211c8d742
 2020-10-06 10:01:29 +01:00
Jooyung Han
2c4999b7f7 Merge "apex: emit file_contexts for flattened apex" am: 51ce6b0acc am: 605b7a6bde am: 0d7b03fc88 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1435292

Change-Id: I6cafcf3656454773cd3663abc8b48223b89737eb
 2020-10-06 04:25:30 +00:00
Jooyung Han
0d7b03fc88 Merge "apex: emit file_contexts for flattened apex" am: 51ce6b0acc am: 605b7a6bde 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1435292

Change-Id: I08b7c17f2e69b94c698f5f7d8949b7e30e5e1943
 2020-10-06 04:01:25 +00:00
Jooyung Han
605b7a6bde Merge "apex: emit file_contexts for flattened apex" am: 51ce6b0acc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1435292

Change-Id: I23fe348b58f5e60fd854c79c594b09a8fa66c6da
 2020-10-06 03:43:55 +00:00
Martin Stjernholm
02460abb30 Avoid conflicting shared libraries from SDK snapshots. 
Test: m nothing
Test: env SANITIZE_HOST=address \
  SANITIZE_TARGET='hwaddress fuzzer' \
  build/soong/soong_ui.bash --make-mode \
  TARGET_PRODUCT=blueline_hwasan haiku dist
Bug: 170041398
Change-Id: Ifa4f72d6778cbb10663a780c7eb54b5e21d5b571
 2020-10-06 04:27:42 +01:00
Jooyung Han
51ce6b0acc Merge "apex: emit file_contexts for flattened apex" 2020-10-06 03:26:14 +00:00
Colin Cross
565cafdcb1 Don't create version variations of sdk modules 
They are never used, skip creating them.

Test: m checkbuild
Change-Id: I4c8cd544327ae79b781f704be5a9064efdbdf2af
 2020-10-05 18:57:26 -07:00