StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,345 Commits 1 Branch 0 Tags
1c93a4d74aa73833dbe8ec5b06c5c6ea01ce3039
Commit Graph

3243 Commits

Author SHA1 Message Date
Treehugger Robot
1c93a4d74a Merge "Revert "Revert "Remove create_stubs and checkapi from droiddoc""" am: b8e35ca4a4 am: 57d6fe4a8c am: 0cd65aef49 am: 06778bade1 am: b78d2a30fa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1424568

Change-Id: Ib6143b28fa4bde35efaa7976b53aeb45b31ea2fc
 2020-09-11 23:45:30 +00:00
Treehugger Robot
b8e35ca4a4 Merge "Revert "Revert "Remove create_stubs and checkapi from droiddoc""" 2020-09-10 20:52:55 +00:00
Ulyana Trafimovich
b27d3a596e Merge "Replace is_uses_lib property with provides_uses_lib." am: 79a94a27b6 am: df9afcd9b6 am: c2c40cdbc5 am: ccdc6e74bd am: f31eb25bb6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423137

Change-Id: Id402ab7da678c11c0d270df8af870819340cd24e
 2020-09-10 18:28:21 +00:00
Xin Li
80dc4f137a Merge "Merge Android R" 2020-09-10 17:22:09 +00:00
Liz Kammer
e1ab250ec8 Revert "Revert "Remove create_stubs and checkapi from droiddoc"" 
This reverts commit 3666c7023f.

Reason for revert: This was originally reverted because it caused a breakage (b/167405890) in a branch that is no longer relevant.

Change-Id: I81063cd47b816b5b3c0ab8427432730d6b881a3f
 2020-09-10 15:29:25 +00:00
Ulyana Trafimovich
df9afcd9b6 Merge "Replace is_uses_lib property with provides_uses_lib." am: 79a94a27b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1423137

Change-Id: I22b08e951667d14b03a52b091ae34ebb885d5fd9
 2020-09-10 14:58:14 +00:00
Ulyana Trafimovich
79a94a27b6 Merge "Replace is_uses_lib property with provides_uses_lib." 2020-09-10 14:34:20 +00:00
Kousik Kumar
c10fd9d1c6 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: f15ed4fe61 am: 4ed93ef2d6 am: 330184504b am: 08db7c4b37 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I02fffd8b3b85a9fb4d0d4f6e314c7e287d3b8360
 2020-09-10 11:17:24 +00:00
Kousik Kumar
f15ed4fe61 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302
 2020-09-10 09:50:35 +00:00
Ulya Trafimovich
54027b572e Replace is_uses_lib property with provides_uses_lib. 
The previous property was boolean-valued and provided only the
information whether the library should be treated as <uses-library>
by Soong. The new property is an optional string, which is the name of
the <uses-library>. The name can be different from the module name, as
in the case of "qcrilhook" module which provides <uses-library>
"com.qualcomm.qcrilhook".

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I65b68e6f7c420ab9c443a76de4c917d31fcd8c8f
 2020-09-10 10:47:41 +01:00
Kousik Kumar
3e0b9c031c Merge "Check UseRBE is set before replacing any template with the RE version." 2020-09-10 09:24:17 +00:00
kellyhung
35fb1bea5c Add test_mainline_module option. am: 74b00521f8 am: af286f3312 am: dfde06a662 am: bf3f14866b am: a3e7f8354c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402513

Change-Id: I423820f6df732c2f56bac6aeb538c24de21fb300
 2020-09-09 09:59:47 +00:00
kellyhung
af286f3312 Add test_mainline_module option. am: 74b00521f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402513

Change-Id: I4824247226e786363cf94815576a93da3deb73da
 2020-09-09 08:06:35 +00:00
kellyhung
74b00521f8 Add test_mainline_module option. 
Bug: 165425972

Test: m HelloWorldTests
Change-Id: I6e60b3895328c4f7aef0bfb30dcdefc30ee1d8ed
 2020-09-09 02:15:39 +00:00
Treehugger Robot
b2154d0d0e Merge "Don't assume host arch is always x86" am: daf735287b am: 9ef1f7d96a am: b2cf8359ea am: 29bd18fd53 am: 6fd5f554a0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1415953

Change-Id: I78cd55d31788e011c276cb7eb5b246d981effbca
 2020-09-09 01:45:49 +00:00
Treehugger Robot
9ef1f7d96a Merge "Don't assume host arch is always x86" am: daf735287b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1415953

Change-Id: I049556891890833c1e7db6483e5ee6446714583e
 2020-09-09 00:32:18 +00:00
Treehugger Robot
daf735287b Merge "Don't assume host arch is always x86" 2020-09-09 00:13:50 +00:00
Ulyana Trafimovich
b69b325e74 Merge "Be more strict about unknown install <uses-library> paths." am: 117a5ef307 am: 0f13eff149 am: 84ed91df7d am: 21055b580d am: 9c8aa68ae3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418529

Change-Id: Idbe77ed42ac4bfcb8365357042fada4b6615caf2
 2020-09-08 16:59:43 +00:00
Ulyana Trafimovich
0f13eff149 Merge "Be more strict about unknown install <uses-library> paths." am: 117a5ef307 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418529

Change-Id: Ib28e902e7f8ec57a15ef50692024cd37a96696bc
 2020-09-08 15:34:50 +00:00
Jiyong Park
87788b5247 Don't assume host arch is always x86 
This change fixes some places where host arch is assumed to be x86 to
form a path element like linux-x86. In preparation for non-x86 host
targets, the host arch part is derived from the context.

In addition, InstallForceOS() is refactored so that it can override not
only OsType, but also ArchType. Without this, the paths for the
robolectic modules will be changed from linux-x86 to linux-common, which
breaks several other places where the old paths are expected.

Bug: 134795810
Test: m
Change-Id: Ib38c715948ae546e55021ece82bac1d82e9e5da0
 2020-09-08 15:12:10 +09:00
Ulya Trafimovich
045e11ad0d Be more strict about unknown install <uses-library> paths. 
Allow default install paths only for compatibility libraries. For other
libraries that are explicitly specified in `uses_libs` and
`optional_uses_libs` unknown install path should be an error.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: I2209c90a939a8aa46c42e13bb42d09c07e4d0895
 2020-09-07 13:58:51 +01:00
Ulyana Trafimovich
f0436cd631 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." am: bb3467d297 am: 99bd329274 am: b55d73f706 am: 757989d5f9 am: 6e049dbc02 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417188

Change-Id: I4014e430fc497d35aeedb9feca23ee22c183e8c3
 2020-09-07 11:48:25 +00:00
Ulyana Trafimovich
99bd329274 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." am: bb3467d297 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417188

Change-Id: If25aaa0174091e966cc5c6b16063b6486a7b4ab6
 2020-09-07 10:23:53 +00:00
Ulyana Trafimovich
bb3467d297 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." 2020-09-07 09:49:07 +00:00
Treehugger Robot
e30fd7bbc5 Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49 am: da55e8208f am: e124bd97d9 am: c375a20168 am: 872926034c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533

Change-Id: Ife02350680a0cfc3196ccf3ff906e96b0aa96f84
 2020-09-04 02:52:37 +00:00
Treehugger Robot
d7d3f824bc Merge "Add imports_compile_dex to prebuilt_apis" am: cda9a92efb am: 48e2acaf99 am: cc4fb483cb am: 93181d21fc am: 4d015fbed3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418868

Change-Id: I9b922ddb38108f46a9a537dd22ba7a49e5ec499c
 2020-09-04 01:34:46 +00:00
Treehugger Robot
da55e8208f Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533

Change-Id: I42df02457960f99d3257d131524d8005e2c7a97e
 2020-09-04 01:17:25 +00:00
Treehugger Robot
bfb98ece49 Merge "Iterate <uses-library> in deterministic order in manifest_fixer." 2020-09-04 00:45:48 +00:00
Treehugger Robot
48e2acaf99 Merge "Add imports_compile_dex to prebuilt_apis" am: cda9a92efb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418868

Change-Id: I29a69d3fd58d9bd7d02ad27fc5b9b9b54b633f63
 2020-09-04 00:05:40 +00:00
Ulya Trafimovich
d2c7ddc82a Iterate <uses-library> in deterministic order in manifest_fixer. 
Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: Ideb7e0f7beae8c80561f841b8ce9129003f1aa96
 2020-09-03 15:52:01 +01:00
Ramy Medhat
16f23a4038 Check UseRBE is set before replacing any template with the RE version. 
Test: presubmit
Change-Id: I6df58b4e700f0d231367af2710672d731d20a736
 2020-09-03 01:29:49 -04:00
Anton Hansson
69b90023b9 Merge "Change sdk_library child visibility semantics" am: 3652018b83 am: 847ca7514e am: 7abd275906 am: c720b16cd1 am: 876e5e9066 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416192

Change-Id: I3e1f940c0e5ca5e11b9571d2e232534a5899451a
 2020-09-02 18:09:13 +00:00
Liz Kammer
4e7f2607ed Add imports_compile_dex to prebuilt_apis 
Allows specifying compile_dex for java_import modules generated by
prebuilt_apis.

Bug: 160455085
Test: m sdk_public_current_android
Change-Id: Id316ba740577b2c9c0522368c01072864cda6cca
 2020-09-02 09:27:35 -07:00
Anton Hansson
847ca7514e Merge "Change sdk_library child visibility semantics" am: 3652018b83 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416192

Change-Id: I6d013916d33618dab06447fbfd7ee0d9e2d09d7a
 2020-09-02 15:56:58 +00:00
Anton Hansson
3652018b83 Merge "Change sdk_library child visibility semantics" 2020-09-02 14:13:49 +00:00
Anton Hansson
e0b81e4472 Merge "java_sdk_library: Add annotations_enabled property" 2020-09-02 11:36:35 +00:00
Paul Duffin
e22c2ab14b java_sdk_library: Add annotations_enabled property 
Passes it through to droidstubs.

Bug: 155164730
Test: m droid
Change-Id: I8b23a959ce33716dfc4572488a1fd3f6bab73a17
Merged-In: I8b23a959ce33716dfc4572488a1fd3f6bab73a17
(cherry picked from commit 2ce1e81b3e)
 2020-09-02 11:30:54 +01:00
Jooyung Han
3be2358038 Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0 am: 4c92cad10e am: 4d565700b5 am: 378ff68eb5 am: 1b06154e8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12501269

Change-Id: I0e9a408b9547fad45983f39a5b7dbacd19b29c1d
 2020-09-02 08:41:05 +00:00
Jooyung Han
4c92cad10e Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0 
Change-Id: I7115a50254e23e3f7d9cdab960c671195746978e
 2020-09-02 14:19:18 +09:00
Jooyung Han
3a92fbeaff Merge "apex: support prebuilt_firmware for vendor apexes" 2020-09-02 04:17:43 +00:00
Treehugger Robot
891dd0ab3c Merge "Add compile_dex for java_import" am: e263af74db am: 6346ec0f46 am: 21d661b312 am: c286f17997 am: e34b515796 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1392497

Change-Id: I7e0ff955c8725b0b82546e3854e08392728d50ba
 2020-09-02 04:06:21 +00:00
Treehugger Robot
6346ec0f46 Merge "Add compile_dex for java_import" am: e263af74db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1392497

Change-Id: I9fbbd7e1f02a64f5e0ed9b583a61e64fd4306362
 2020-09-02 02:02:32 +00:00
Treehugger Robot
e263af74db Merge "Add compile_dex for java_import" 2020-09-02 01:23:54 +00:00
Steve Kim
3b4d2c542c Merge "Revert "Remove create_stubs and checkapi from droiddoc"" am: b695937f12 am: 33c088e1b1 am: a06a9a0d73 am: 6a70afb6da am: 64722a18d8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417209

Change-Id: I8dd515ba2e98a98e3886da132430404572af95cf
 2020-09-01 21:49:47 +00:00
Steve Kim
a06a9a0d73 Merge "Revert "Remove create_stubs and checkapi from droiddoc"" am: b695937f12 am: 33c088e1b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417209

Change-Id: Ic14a2a424c641f1559f7acdf34de0c4fb5320bf7
 2020-09-01 20:02:16 +00:00
Liz Kammer
d6c31d274e Add compile_dex for java_import 
Test: go java tests
Test: m
Bug: 160455085
Change-Id: I2db95dfe565e78b630007adc3360a58614d0127e
 2020-09-01 12:34:08 -07:00
Liz Kammer
10d1d3de5d Merge "Remove create_stubs and checkapi from droiddoc" am: 4297552423 am: 8e97d6caa0 am: 0111644819 am: 8561294520 am: ed5a167ef8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401388

Change-Id: Idc194aae2289705f5c3e92b9943f5c5b30507b17
 2020-09-01 18:30:38 +00:00
Steve Kim
3666c7023f Revert "Remove create_stubs and checkapi from droiddoc" 
This reverts commit 3a55c91f9d.

Reason for revert: build failed. Guess this is the cause but needs to confirm. Creating a revert per instructions

Change-Id: I30f1c8cd63e5ab84dba5d21ed354a42695c24ec4
 2020-09-01 17:58:01 +00:00
Liz Kammer
0111644819 Merge "Remove create_stubs and checkapi from droiddoc" am: 4297552423 am: 8e97d6caa0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401388

Change-Id: I41b23ae2a163fd940333ae94bdfa068bff75a8d7
 2020-09-01 17:13:52 +00:00
Ulya Trafimovich
21a7375205 Allow non-SDK Java libraries to masquerade as <uses-library>. 
Extend usesLibraryProperties with a boolean is_uses_lib property and
move these properties from java.AndroidApp to java.Module to allow
java.Library modules set the new propery and be recognized as
<uses-library> by Soong.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: I01cd5e0da3dd543c1c0597249d37d0914b213ca7
 2020-09-01 17:45:39 +01:00