Commit graph

7247 commits

Author SHA1 Message Date
Jeff Gaston
47251f7903 [automerger skipped] Merge "Have pom2mk list all duplicates modules" into pi-dev
am: ce3a4bb268  -s ours

Change-Id: I4355c8be7900fe3dbe3ddca43e347e2c26be8289
2018-04-23 12:27:14 -07:00
Jeff Gaston
928b536107 [automerger skipped] Merge "Have pom2mk include runtime deps too" into pi-dev
am: c86f03385e  -s ours

Change-Id: I026048c38954f60cb350e1e7afc4c10d34e60c7b
2018-04-23 12:18:33 -07:00
TreeHugger Robot
ce3a4bb268 Merge "Have pom2mk list all duplicates modules" into pi-dev 2018-04-23 18:57:35 +00:00
TreeHugger Robot
c86f03385e Merge "Have pom2mk include runtime deps too" into pi-dev 2018-04-23 18:57:17 +00:00
Jiyong Park
e8f0eab420 Merge "Add double_loadable property and checks for it" am: 4884a172de
am: 0cc2713142

Change-Id: I75eabc65ef04d33f30c4356c8d3d93ad395059fc
2018-04-20 21:00:57 -07:00
Jiyong Park
0cc2713142 Merge "Add double_loadable property and checks for it"
am: 4884a172de

Change-Id: I2fb6437afb1dcde8c1a013fd219f0437b5f1dc41
2018-04-20 19:24:02 -07:00
Treehugger Robot
4884a172de Merge "Add double_loadable property and checks for it" 2018-04-21 02:14:51 +00:00
Nelson Li
8b51984bb8 Merge "build/make: set LOCAL_NATIVE_BENCHMARK for Google Benchmark Test" am: 7e1130cded
am: aa88c2f7d0

Change-Id: Id55eb015b946246b9f9eff27d81068bab932adc1
2018-04-20 16:24:19 -07:00
Nelson Li
aa88c2f7d0 Merge "build/make: set LOCAL_NATIVE_BENCHMARK for Google Benchmark Test"
am: 7e1130cded

Change-Id: I305b900c662818027638b4452b19c33930d9f52a
2018-04-20 16:20:16 -07:00
Treehugger Robot
7e1130cded Merge "build/make: set LOCAL_NATIVE_BENCHMARK for Google Benchmark Test" 2018-04-20 23:08:36 +00:00
Pirama Arumuga Nainar
73e48810a6 Make 'use_clang_lld' property specifiable per architecture am: 2b8959ad5a
am: c2bfbcf3f1

Change-Id: If373b40e4274d9ebf51437a995901970ce2cdddc
2018-04-20 13:47:23 -07:00
Pirama Arumuga Nainar
c2bfbcf3f1 Make 'use_clang_lld' property specifiable per architecture
am: 2b8959ad5a

Change-Id: I81ac9027d980bfad2216018a91751f54e626823f
2018-04-20 13:44:21 -07:00
Pirama Arumuga Nainar
2b8959ad5a Make 'use_clang_lld' property specifiable per architecture
Bug: http://b/73768157

Test: Mark 'use_clang_lld: true' for one arch of a module and verify by
inspection that only that arch variant uses lld.

Change-Id: I4b0d7a2bc43ee0b8462ab09a5f5c50807129a7fb
2018-04-20 19:11:50 +00:00
Colin Cross
aca00676f1 Merge "Remove product-specific flags from android_library modules" am: 5fd7dfd124
am: ac3b81f4b8

Change-Id: I7ce01ae3f4f3673657d9a17eac1a9b00dfb73be9
2018-04-19 18:38:46 -07:00
Colin Cross
ac3b81f4b8 Merge "Remove product-specific flags from android_library modules"
am: 5fd7dfd124

Change-Id: I554aa46a03c2bdbd97a0e0538088a618e9a8be4f
2018-04-19 18:35:40 -07:00
Colin Cross
5fd7dfd124 Merge "Remove product-specific flags from android_library modules" 2018-04-20 01:22:05 +00:00
Colin Cross
e78dcd313c Remove product-specific flags from android_library modules
Static android libraries should not get the product-specific
flags.

Bug: 73724997
Test: m checkbuild
Change-Id: I89e8c0a3fb788b18ee6603e9d21c9b9a5275f42f
2018-04-19 15:28:21 -07:00
Jiyong Park
ec16fcbc89 Merge "Adding java_sdk_library" am: dcbc89a3ab
am: f4b9a287b1

Change-Id: I1a56aacfd2915b1d678416d21650178be716de08
2018-04-19 11:51:24 -07:00
Jiyong Park
f4b9a287b1 Merge "Adding java_sdk_library"
am: dcbc89a3ab

Change-Id: I0709b0b66e8f30482d5cf7ecb64bf2765f677e60
2018-04-19 11:47:49 -07:00
Treehugger Robot
dcbc89a3ab Merge "Adding java_sdk_library" 2018-04-19 18:33:31 +00:00
Chih-hung Hsieh
c02a47647b Merge "Define clang lld flags for hosts." am: 94853de469
am: 473af9f5c7

Change-Id: Ie8ee2a49eeb55b4a2997055fed7d2602854cf425
2018-04-19 10:15:45 -07:00
Chih-hung Hsieh
473af9f5c7 Merge "Define clang lld flags for hosts."
am: 94853de469

Change-Id: I033f9f2f4963c84cbc4076a04f5da2b212a1292a
2018-04-19 10:11:45 -07:00
Chih-hung Hsieh
94853de469 Merge "Define clang lld flags for hosts." 2018-04-19 17:03:02 +00:00
Jiyong Park
2cfe880b5b Merge "Friendlier message for ABI reference update" am: 21838336c4
am: 482e6f1b57

Change-Id: If5293c012e43c03c9910472eedae6f0db9300097
2018-04-18 20:30:37 -07:00
Jiyong Park
482e6f1b57 Merge "Friendlier message for ABI reference update"
am: 21838336c4

Change-Id: I513ba538cc1791ee9253e245c6dd0d7a87698966
2018-04-18 20:27:06 -07:00
Treehugger Robot
21838336c4 Merge "Friendlier message for ABI reference update" 2018-04-19 03:15:57 +00:00
Jiyong Park
a5f11e426c Friendlier message for ABI reference update
This change is to let people to just copy & paste the update command

Test: break the ABI of libbinder intentionally and make.
The message includes absolute path to the create_reference_dump.py tool.

Change-Id: If7703d64be1f51ea4b054aa1e815276e1d6dbc14
2018-04-19 10:42:40 +09:00
Colin Cross
48c1526fc8 [automerger skipped] Merge "Reverse RRO dir paths when passing to Make" into pi-dev
am: 74d547d13c  -s ours

Change-Id: I7ff2f31ae1bc9372e20a9a068ac74cc54242a000
2018-04-18 18:24:34 -07:00
TreeHugger Robot
74d547d13c Merge "Reverse RRO dir paths when passing to Make" into pi-dev 2018-04-19 01:12:40 +00:00
Jiyong Park
c678ad3f71 Adding java_sdk_library
java_sdk_library is to make a Java library that implements optional
SDK APIs to apps. It is actually a wrapper for several modules: 1) stubs
library that clients are linked against to, 2) droiddoc module that
internally generates API stubs source files, 3) the real runtime shared
library that implements the API, and 4) XML file for adding the runtime
lib to the classpath at runtime if requested via <uses-library>.

Note: this is only the initial CL for the feature. Followings are features
currently missing and under development.

1) check for API consistency
2) install stubs libs as the dist artifacts
3) ensuring that apps have appropriate <uses-library> tag
4) disallowing linking to the runtime shared lib
5) HTML generation

Bug: 77575606
Test: m -j

Change-Id: I4a4ccf6e730e041703c63bb275d8860d0de96887
2018-04-19 08:57:30 +09:00
Colin Cross
c16280cf87 [automerger skipped] Merge "Fix aapt2 --min-sdk-version after finalized SDK" into pi-dev
am: e13f0fec3c  -s ours

Change-Id: I43780e8bb8b666692615c35f0e7d7d7e5de2d318
2018-04-18 16:24:26 -07:00
Colin Cross
bf91189426 [automerger skipped] Fix aapt2 --min-sdk-version after finalized SDK
am: e20c1b1904  -s ours

Change-Id: If7eb89aeb856b7024e2c8e6f9befc4d6be9f7b7f
2018-04-18 16:23:54 -07:00
Colin Cross
e13f0fec3c Merge "Fix aapt2 --min-sdk-version after finalized SDK" into pi-dev 2018-04-18 23:13:54 +00:00
Colin Cross
3f49fcb62b Merge "Fix aapt2 --min-sdk-version after finalized SDK" am: 59bcf6e631
am: 9d0af2e737

Change-Id: I9d43e2d829aac6273be319968c9afb37b8331570
2018-04-18 15:35:23 -07:00
Colin Cross
10f450962a Merge "Reverse RRO dir paths when passing to Make" am: 5ddf292268
am: f5a9cca054

Change-Id: I90e4766ef62487963dd10b7138af01effcafef79
2018-04-18 15:35:11 -07:00
Colin Cross
9d0af2e737 Merge "Fix aapt2 --min-sdk-version after finalized SDK"
am: 59bcf6e631

Change-Id: I56bde0f49c2931dc105471effbe5ea80d009ac29
2018-04-18 15:32:18 -07:00
Colin Cross
f5a9cca054 Merge "Reverse RRO dir paths when passing to Make"
am: 5ddf292268

Change-Id: I3ff9ae83c75a3b8a10270fbf1bcc98c2e3e64663
2018-04-18 15:32:06 -07:00
Colin Cross
9ccbc6036d Reverse RRO dir paths when passing to Make
LOCAL_RESOURCE_DIRS puts the highest priority overlay first, but
aapt2 expects the highest priority overlay last.  Soong stores the
list in aapt2 order (low to high priority), but that means when it
exports to Make as LOCAL_SOONG_RRO_DIRS, which goes to
build_rro_package.mk and then package_internal.mk, it gets reversed
again and comes out backwards.

Bug: 78032566
Test: m checkbuild
Change-Id: If72bf929fbf1d126f9051a2f21ec1eb4e3030e6e
Merged-In: If72bf929fbf1d126f9051a2f21ec1eb4e3030e6e
(cherry picked from commit a140bb05f1)
2018-04-18 15:26:55 -07:00
Colin Cross
59bcf6e631 Merge "Fix aapt2 --min-sdk-version after finalized SDK" 2018-04-18 22:22:25 +00:00
Colin Cross
5ddf292268 Merge "Reverse RRO dir paths when passing to Make" 2018-04-18 22:22:06 +00:00
Pirama Arumuga Nainar
6c77d18183 Fix few issues with filegroups am: 955dc4999e
am: daf0ac55ea

Change-Id: I28fe1931c64564cf1a0f34e4a0cc042e6c9ccc9e
2018-04-18 14:15:29 -07:00
Pirama Arumuga Nainar
daf0ac55ea Fix few issues with filegroups
am: 955dc4999e

Change-Id: Iaf017c917db2b5fe6c1844461ceeba3d8372270d
2018-04-18 14:12:23 -07:00
Colin Cross
e20c1b1904 Fix aapt2 --min-sdk-version after finalized SDK
aapt2 --min-sdk-version was using AppsDefaultVersionName(), which
is OMR1 for a non-finalized SDK, but 8.1.0 after finalization.
Add PlatformSdkCodename() for non-finalized SDKs, use it for
DefaultAppTargetSdk(), and pass it for aapt2 --min-sdk-version.

Bug: 78224641
Test: TestAppSdkVersion in app_test.go
Change-Id: I622eaf92f8a940f79007c2a579536da325700b06
Merged-In: I622eaf92f8a940f79007c2a579536da325700b06
(cherry picked from commit d09b0b653b)
2018-04-18 12:48:02 -07:00
Colin Cross
d09b0b653b Fix aapt2 --min-sdk-version after finalized SDK
aapt2 --min-sdk-version was using AppsDefaultVersionName(), which
is OMR1 for a non-finalized SDK, but 8.1.0 after finalization.
Add PlatformSdkCodename() for non-finalized SDKs, use it for
DefaultAppTargetSdk(), and pass it for aapt2 --min-sdk-version.

Bug: 78224641
Test: TestAppSdkVersion in app_test.go
Change-Id: I622eaf92f8a940f79007c2a579536da325700b06
2018-04-18 12:39:25 -07:00
Pirama Arumuga Nainar
955dc4999e Fix few issues with filegroups
Bug: http://b/64121881
Bug: http://b/78188880

- Allow filegroup's properties to be extended by a LoadHook
- Support a filegroup (':module') in a prebuilt's 'Srcs' property to
export files from a different path as the prebuilt's sources.

This change also includes a refactoring that moves genrule/filegroup.go
to android/filegroup.go so that FileGroupFactory is visible in
prebuilt_test.go.

Test: Test
https://android-review.googlesource.com/c/platform/development/+/469159
in clang-tools branch on Linux, Darwin.  Test regular build in
aosp/master.

Change-Id: I3ff6215ab2e62955f039fd1086c31f1bd50ebcf6
2018-04-18 18:56:33 +00:00
Jayant Chowdhary
159fdcfbf6 [automerger skipped] Merge "Setting SKIP_ABI_CHECKS=true will make soong skip native abi checks." into pi-dev
am: 31db990217  -s ours

Change-Id: Ibc8bf0d15e302e1412ac8d94326def8f901bc956
2018-04-18 11:22:41 -07:00
Jayant Chowdhary
31db990217 Merge "Setting SKIP_ABI_CHECKS=true will make soong skip native abi checks." into pi-dev 2018-04-18 18:08:00 +00:00
Nelson Li
1f6b14e822 build/make: set LOCAL_NATIVE_BENCHMARK for Google Benchmark Test
Set LOCAL_NATIVE_BENCHMARK to true. Then, build system can use it
to auto generate the related Test config file of Google Benchmark
Test

Bug:74844131
Test: Use mm to rebuild any module in cc_benchmark
Change-Id: I6a8f1ff78f7aec3f4eb17e218845f0cdf3f57f32
2018-04-18 17:28:57 +00:00
Anton Hansson
cbe6a7f772 Merge "Migrate soong to use new sdk prebuilts." am: 6284323772
am: f6677ff743

Change-Id: I85ea8ded0b03f52adac92ab58e0685162468c6b3
2018-04-18 08:46:56 -07:00
Anton Hansson
f6677ff743 Merge "Migrate soong to use new sdk prebuilts."
am: 6284323772

Change-Id: I8a957d1c32847d96509373ee71ef5648d9dcd480
2018-04-18 08:42:24 -07:00