tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23224 commits 1 branch 0 tags 115 MiB
Commit graph

23224 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
ced8c64073 Merge "Don't create version variants for SDK variants" am: 6116ffdcf5 am: 974d8be0ac 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1340033

Change-Id: I0f31d72d4f0a1792121000c653c67da0183217be
 2020-06-17 04:32:51 +00:00
Yo Chiang
7b7f0d8265 Merge "Don't emit superfluous LOCAL_OVERRIDES_MODULES" am: f298a3f325 am: 1bc15fdfc9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335760

Change-Id: Ie61e0025ddfab1a068bb209685938cb29a3895bd
 2020-06-17 04:32:38 +00:00
Treehugger Robot
974d8be0ac Merge "Don't create version variants for SDK variants" am: 6116ffdcf5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1340033

Change-Id: I86cfb5da7dd914b67605de75b83898487e37b6d1
 2020-06-17 04:19:43 +00:00
Yo Chiang
1bc15fdfc9 Merge "Don't emit superfluous LOCAL_OVERRIDES_MODULES" am: f298a3f325 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335760

Change-Id: I14727d613fea9298701675e798125f03531b108c
 2020-06-17 04:19:31 +00:00
Treehugger Robot
6116ffdcf5 Merge "Don't create version variants for SDK variants" 2020-06-17 04:19:04 +00:00
Jiyong Park
2286afd0ef Don't create version variants for SDK variants 
When a lib has sdk_version set, an SDK variant and a platform variant
are created by the sdkMutator. Then by the versionMutator, if the
library had 'stubs.versions' property, one or more versioned variants
and one impl variant are created for each of the two (SDK and platform)
variants. As a concrete example,

cc_library {
    name: "foo",
    sdk_version: "current",
    stubs: { versions: ["1", "2"], },
}

would create 6 variants:

1) (sdk: "", version: "")
2) (sdk: "", version: "1")
3) (sdk: "", version: "2")
4) (sdk: "sdk", version: "")
5) (sdk: "sdk", version: "1")
6) (sdk: "sdk", version: "2")

This is somewhat uncessary because the need for the SDK mutator is to
have the platform variant (sdk:"") of a lib where sdk_version is unset,
which actually makes sens for the impl variant (version:""), but not
the versioned variants (version:"1" or version:"2").

This is not only unncessary, but also causes duplicate module
definitions in the Make side when doing an unbundled build. Specifically,
The #1 and #4 above both are emitted to Make and get the same name
"foo".

To fix the problem and not to create unnecessary variants, the versioned
variants are no longer created for the sdk variant. So, foo now has
the following variants only.

1) (sdk: "", version: "") // not emitted to Make (by versionMutator)
2) (sdk: "", version: "1") // not emitted to Make (by versionMutator)
3) (sdk: "", version: "2") // emitted to Make (by versionMutator)
4) (sdk: "sdk", version: "") // not emitted to Make (by versionMutator)

Bug: 159106705
Test: Add sdk_version:"minimum" to libnativehelper in libnativehelper/Android.bp.
m SOONG_ALLOW_MISSING_DEPENDENCIES=true TARGET_BUILD_UNBUNDLED=true libnativehelper

Change-Id: I6f02f4189e5504286174ccff1642166da82d00c9
 2020-06-17 04:18:21 +00:00
Yo Chiang
f298a3f325 Merge "Don't emit superfluous LOCAL_OVERRIDES_MODULES" 2020-06-17 04:03:03 +00:00
Colin Cross
109f833632 [automerger skipped] Merge "Use inclusive language in Android.bp files" am: a2e64e7b84 am: bfd080aa5d -s ours 
am skip reason: Change-Id Id9efbd99be54b191193eae1c5672230ca54cf1d2 with SHA-1 a44a6b27f9 is in history

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

Change-Id: I3a1f60f61cfa538e9d53f767bb1d1257c01f26e5
 2020-06-17 01:33:29 +00:00
Colin Cross
bfd080aa5d Merge "Use inclusive language in Android.bp files" am: a2e64e7b84 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331695

Change-Id: Iab2fd673c92e3426227fcbacb5fbd99217125a3a
 2020-06-17 01:15:03 +00:00
Colin Cross
a2e64e7b84 Merge "Use inclusive language in Android.bp files" 2020-06-17 01:04:26 +00:00
Inseob Kim
b83199c721 Merge "Always create both variants for kernel headers" am: bee157256d am: aa98f34144 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1328735

Change-Id: I1c9f2dc53bbe157819ad1bba8c463f02fb5c428f
 2020-06-17 00:19:38 +00:00
Inseob Kim
591dab5372 Merge "Choose SAbi files with module's vndk version" am: 9a0b897904 am: a8b6f0ba48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326994

Change-Id: I3191b9eee3ac497c7885c60a85d7fc839f1d5f8b
 2020-06-17 00:19:26 +00:00
Inseob Kim
e11ffe52a9 Merge "Exclude kernel_headers from vendor snapshot" am: 6fec12abc7 am: b6680bdab5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1328736

Change-Id: Ic972188c3acb901852a4d69ac99215e133653cf6
 2020-06-17 00:19:08 +00:00
Inseob Kim
aa98f34144 Merge "Always create both variants for kernel headers" am: bee157256d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1328735

Change-Id: Ic59702e12a4bccca23813cc1b5c35a3f03625888
 2020-06-17 00:05:00 +00:00
Inseob Kim
a8b6f0ba48 Merge "Choose SAbi files with module's vndk version" am: 9a0b897904 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326994

Change-Id: Ibd1076cf1c52a885466318e650ef2302dfad95ac
 2020-06-17 00:04:54 +00:00
Inseob Kim
b6680bdab5 Merge "Exclude kernel_headers from vendor snapshot" am: 6fec12abc7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1328736

Change-Id: I8f7f4157d742032e56df3371bc2d8c63e2e65e4f
 2020-06-17 00:04:33 +00:00
TreeHugger Robot
f0f9433077 [automerger skipped] Merge "Installed APKs should not have prebuilt_ prefix" into rvc-dev am: 78bb73972d -s ours 
am skip reason: Change-Id I48f2595781efc1303c777619e082ce7765b73038 with SHA-1 57f0ee1fa9 is in history

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

Change-Id: I2138fc9483de957dfa94956e56fc8f17b0eb6378
 2020-06-16 23:40:01 +00:00
Inseob Kim
bee157256d Merge "Always create both variants for kernel headers" 2020-06-16 23:38:02 +00:00
Inseob Kim
9a0b897904 Merge "Choose SAbi files with module's vndk version" 2020-06-16 23:38:00 +00:00
Inseob Kim
6fec12abc7 Merge "Exclude kernel_headers from vendor snapshot" 2020-06-16 23:37:57 +00:00
Colin Cross
cbd62d07d4 Use inclusive language in Android.bp files 
Test: m checkbuild
Change-Id: Id9efbd99be54b191193eae1c5672230ca54cf1d2
Merged-In: Id9efbd99be54b191193eae1c5672230ca54cf1d2
 2020-06-16 23:36:51 +00:00
TreeHugger Robot
78bb73972d Merge "Installed APKs should not have prebuilt_ prefix" into rvc-dev 2020-06-16 23:27:33 +00:00
Treehugger Robot
6e28ab8c7a Merge "Installed APKs should not have prebuilt_ prefix" am: 001ad5a6fc am: 05cd5562f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1339635

Change-Id: Ia2a3197e0b509387ff782bf7e295bff7e8b56471
 2020-06-16 23:01:29 +00:00
Treehugger Robot
05cd5562f2 Merge "Installed APKs should not have prebuilt_ prefix" am: 001ad5a6fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1339635

Change-Id: I2149948b115e232d4e31e0b3bff60a4d39fa16b0
 2020-06-16 22:47:47 +00:00
Treehugger Robot
001ad5a6fc Merge "Installed APKs should not have prebuilt_ prefix" 2020-06-16 22:34:29 +00:00
Treehugger Robot
f1429cab7d Merge "Prefer armv8.2-a to armv8.2a for GNU as compatibility" am: e6c1d80072 am: f8fdc174d0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1339953

Change-Id: I2b9a423516f0d26735225c05c6442e44c0696113
 2020-06-16 22:08:15 +00:00
Treehugger Robot
f8fdc174d0 Merge "Prefer armv8.2-a to armv8.2a for GNU as compatibility" am: e6c1d80072 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1339953

Change-Id: I50a030727bdc0c8c68ad047c929a50ed5be8e548
 2020-06-16 21:55:55 +00:00
Treehugger Robot
e6c1d80072 Merge "Prefer armv8.2-a to armv8.2a for GNU as compatibility" 2020-06-16 21:45:06 +00:00
Christopher Parsons
8650233b54 Merge "When bpfix fails in androidmk, output the tree anyway" am: 549a0d866a am: e92a9a00d7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326234

Change-Id: Iba6b5c8e85cc1baf059acda191877084c5afc4f8
 2020-06-16 20:36:58 +00:00
Alex Humesky
7072985393 Merge "Do not override "-g:source,lines" for host java binaries when PRODUCT_MINIMIZE_JAVA_DEBUG_INFO is set." am: c7f8b74365 am: 849ca22fe0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1339636

Change-Id: I482dee048952846d251168df148817e5b6c0efbd
 2020-06-16 20:36:44 +00:00
Christopher Parsons
e92a9a00d7 Merge "When bpfix fails in androidmk, output the tree anyway" am: 549a0d866a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326234

Change-Id: Id650c4282ae8fdeece0b6115cf8e42af4e0cd5f8
 2020-06-16 20:24:57 +00:00
Alex Humesky
849ca22fe0 Merge "Do not override "-g:source,lines" for host java binaries when PRODUCT_MINIMIZE_JAVA_DEBUG_INFO is set." am: c7f8b74365 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1339636

Change-Id: I3c12c0dfa276d2c6e672c95270a33ca2d883b226
 2020-06-16 20:24:45 +00:00
Christopher Parsons
549a0d866a Merge "When bpfix fails in androidmk, output the tree anyway" 2020-06-16 20:16:03 +00:00
Alex Humesky
c7f8b74365 Merge "Do not override "-g:source,lines" for host java binaries when PRODUCT_MINIMIZE_JAVA_DEBUG_INFO is set." 2020-06-16 20:08:58 +00:00
Anton Hansson
caa7749d82 [automerger skipped] Merge "Let APEX build against preferred java_sdk_library_import" into rvc-dev am: c3754ba042 -s ours 
am skip reason: Change-Id I2f4edea937ac377431a5696c92cbd467bded62ef with SHA-1 eedc5d55ce is in history

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

Change-Id: I91d1b93ce29416692d3d2cfe638b6f55b9a630ff
 2020-06-16 18:02:36 +00:00
Anton Hansson
c3754ba042 Merge "Let APEX build against preferred java_sdk_library_import" into rvc-dev 2020-06-16 17:47:16 +00:00
Sasha Smundak
854c14f334 Installed APKs should not have prebuilt_ prefix 
Bug: 159031374
Test: treehugger & manual
Merged-In: I48f2595781efc1303c777619e082ce7765b73038
Change-Id: I86d8036e277ef978256d0a69de0edbb30a2bc304
 2020-06-16 10:29:18 -07:00
Sasha Smundak
57f0ee1fa9 Installed APKs should not have prebuilt_ prefix 
Bug: 159031374
Test: treehugger & manual
Change-Id: I48f2595781efc1303c777619e082ce7765b73038
 2020-06-16 09:41:02 -07:00
Paul Duffin
98c5d09541 Merge "Let APEX build against preferred java_sdk_library_import" am: e40383355b am: 86be0eafca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331928

Change-Id: Ia4bb1dc336da459172dd74bedef7396085796dfc
 2020-06-16 09:57:40 +00:00
Paul Duffin
86be0eafca Merge "Let APEX build against preferred java_sdk_library_import" am: e40383355b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331928

Change-Id: Ia8ab93d3eeb49d1b28263ff5c8388b53c4cc1609
 2020-06-16 09:47:15 +00:00
Paul Duffin
f642a31ab5 Let APEX build against preferred java_sdk_library_import 
If a java_sdk_library_import has a corresponding java_sdk_library then
make the java_sdk_library_import export both the xml and impl modules
created by the java_sdk_library.

Makes java_sdk_library_import consistent with java_sdk_library by
providing libraries within the same APEX access to the implementation
library instead of the stubs.

Bug: 158304459
Test: m nothing
      Test what happens when building com.android.tethering with and without
      a preferred "framework-tethering" java_sdk_library_import. Make sure that
      it does not change the generated APEX.
Merged-In: I2f4edea937ac377431a5696c92cbd467bded62ef
Change-Id: I2f4edea937ac377431a5696c92cbd467bded62ef
(cherry picked from commit eedc5d55ce)
 2020-06-16 10:43:19 +01:00
Stephen Hines
502f901e17 Prefer armv8.2-a to armv8.2a for GNU as compatibility 
There are still out-of-tree users of `-fno-integrated-as`, which will
have issues without the hyphen.

Bug: http://b/158191033
Test: ./build.py
Change-Id: I44b68ab5b65a68df3993f38b99662178915e9be2
 2020-06-16 02:40:40 -07:00
Paul Duffin
e40383355b Merge "Let APEX build against preferred java_sdk_library_import" 2020-06-16 09:37:53 +00:00
Yo Chiang
12d9f7a103 Don't emit superfluous LOCAL_OVERRIDES_MODULES 
Don't emit an empty LOCAL_OVERRIDES_MODULES line if APEX is not
overriding any module.

Test: TH noop
Change-Id: I7abbaccd54bf2ffa25a6c798260c81284ea5ecb2
 2020-06-16 17:33:57 +08:00
TreeHugger Robot
5d0684fa61 Merge "Remove inadvertently commited java/lint_defaults.txt" into rvc-dev-plus-aosp 2020-06-16 05:18:18 +00:00
Colin Cross
e8f7f90496 Merge changes from topics "soong-inclusive-language", "soong_inclusive_language2" into rvc-dev am: f4a5492ec9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11859399

Change-Id: I1b009faacad99fcbfbf6cd06193f033ea37f6040
 2020-06-16 03:43:15 +00:00
Colin Cross
3c76d01110 [automerger skipped] Use inclusive language in build/soong am: 95f7b34e8e -s ours 
am skip reason: Change-Id Id07890b7cbc2397291a658ca00e86b43c743aafc with SHA-1 440e0d0542 is in history

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

Change-Id: I2b8cf377c18e6487ebf10b114f8781364c15fde5
 2020-06-16 03:43:12 +00:00
Colin Cross
651454cff2 [automerger skipped] Merge changes from topics "soong-dist", "tests-PathForSource" into rvc-dev am: c8697f6ae5 -s ours 
am skip reason: Change-Id Ia5ddb31afe29329f2df0ae1297ed963c8c28e590 with SHA-1 3cda0d8df9 is in history

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

Change-Id: I3db86914ee97f81a26f5182d371ae3350cbe3e54
 2020-06-16 03:42:51 +00:00
Colin Cross
f4a5492ec9 Merge changes from topics "soong-inclusive-language", "soong_inclusive_language2" into rvc-dev 
* changes:
  Use inclusive language in Android.bp files
  Use inclusive language in build/soong
 2020-06-16 03:28:15 +00:00
Colin Cross
c8697f6ae5 Merge changes from topics "soong-dist", "tests-PathForSource" into rvc-dev 
* changes:
  Add DistForGoal to MakeVarsContext
  Define Soong phony rules in Make
  Remove paths from cc.TestConfig
  Remove most paths from java.TestConfig
  Allow tests to bypass PathForSource existence checks
 2020-06-16 03:27:32 +00:00