Commit Graph

151 Commits

Author SHA1 Message Date
Anton Hansson
ed19ee5981 Merge "Use generated merged annotations.zip in SDK build" 2021-10-18 09:54:05 +00:00
Dan Willemsen
53052e34be Remove old build-tools/platform-tools implementation
These packages are now built with Soong. Since they were the only two
outputs of the windows SDK package, I've also removed that
implementation.

Bug: 187222815
Change-Id: Ib42687cfe79c40066a49d20980a0f6f75914406a
2021-10-15 13:39:11 -07:00
Anton Hansson
2918f63267 Use generated merged annotations.zip in SDK build
The framework-doc-stubs is being transitioned to use module jar stub
source as input, at which point it will stop producing correct
annotations.zip files. Replace the annotations zip file in the sdk
with the one generated from all the constituent parts.

Bug: 187397779
Test: diff sdk.zip before && after (only whitespace diffs in annotations)
Change-Id: I56b22bf4909105a2720221c8de35b517a6e66a3c
2021-10-15 14:50:56 +01:00
Colin Cross
17a74a9d94 Remove mainDexClasses from the SDK
dx has already been removed, and mainDexClasses is not needed with d8.

Test: SDK builds
Change-Id: If3a0ccc1b2b453eb2b1cc9e248383265e1c74588
2021-09-16 14:18:34 -07:00
Anton Hansson
b6edd7aa51 Add sdk extension version info to prop templates
This adds two new properties alongside AndroidVersion.ApiLevel:
- AndroidVersion.ExtensionLevel: The sdk extension version if the SDK
- AndroidVersion.IsBaseSdk: Whether the extension level is the the one
  that the ApiLevel shipped with (true), or if is an extension SDK
  release (false).

While we're here, dedupe the recipe that processes these templates.

Bug: 195281582
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      and inspect the substitution is working
Merged-In: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
2021-08-26 17:11:15 +01:00
satayev
80819a2460 Add systemapi version of api-versions.xml and annotations.zip to dist.
Bug: 190665366
Test: lunch sdk; m sdk dist; and inspect out/dist/system-data/api-versions.xml
Change-Id: If2eca5c63866d24fb46a6929222ed43a94d9bc23
2021-07-12 21:09:05 +01:00
Anton Hansson
1ed8eb8372 Re-submit "Make sdk depend on merged srcjar instead of monolith"
Bug: 158465496
Test: lunch sdk_phone_armv7; m sdk
Change-Id: I204ff3cc043dbc6d2a5383f87a067fc82caee3db
Merged-In: I204ff3cc043dbc6d2a5383f87a067fc82caee3db
2020-11-10 08:02:58 +00:00
Colin Cross
7ee9fed293 Revert "Make sdk depend on merged srcjar instead of monolith"
This reverts commit 11e2f2ad76.

Reason for revert: b/172663078

Bug: 169034951
Bug: 172663078
Change-Id: If8d432b621d5265d3cec4614ba33439ef5cc75a1
2020-11-06 19:27:22 +00:00
Anton Hansson
11e2f2ad76 Make sdk depend on merged srcjar instead of monolith
Bug: 158465496
Test: lunch sdk_phone_armv7; m sdk
Change-Id: I47b37223a05b9d396c97c3a86d76855b834f7f4a
2020-11-05 21:09:44 +00:00
Zhomart Mukhamejanov
3f2433d7a6 Add generated Automotive OS SDK. am: bdb2a60d3e am: d8143b9b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: I725cc6a5be912460e30e5853e6ebe6e2fb166be2
2020-07-29 22:05:55 +00:00
Zhomart Mukhamejanov
bdb2a60d3e Add generated Automotive OS SDK.
- Update old comments in sdk.atree.
- Add README.md with instructions on building sdk.

Test: lunch sdk && m -j sdk
Test: Unzipped and extracted platforms/android-11/optional/android.car.jar
      and verified it with the latest android.car-stubs.jar from
      http://ab/.
Bug: 162442020
Change-Id: I9796fbcecfef5178915008b49d81cda996c66fa2
2020-07-29 20:31:17 +00:00
Anton Hansson
c434b65907 Remove unused phonys
Nothing depends on these.

Test: codesearch android_stubs[^_]
Change-Id: Ic22e3f263c8bb6b23fc443ed8157226073ec474e
2020-07-22 16:21:21 +00:00
Anton Hansson
e7c7f9f280 Remove make-based disting of android stubs
They are being converted to Android.bp-based disting.

Bug: 161214753
Test: diff dist dir after `m sdk dist`
Merged-In: I1af2aac1a354f66ecb9dfa7f2a44af16cdfa647d
Change-Id: I1af2aac1a354f66ecb9dfa7f2a44af16cdfa647d
2020-07-22 16:21:02 +00:00
Colin Cross
0bb7772edc dist annotations.zip and api-versions.xml
Lint in unbundled builds will require annotations.zip and api-versions.xml
in prebuilts/sdk.

Bug: 153485543
Test: forrest
Change-Id: Ice23230c57b9ed30541a6dcb6f507b765e6a03fe
Merged-In: Ice23230c57b9ed30541a6dcb6f507b765e6a03fe
(cherry picked from commit 0c40b60640)
2020-07-06 13:14:27 -07:00
Colin Cross
0c40b60640 dist annotations.zip and api-versions.xml
Lint in unbundled builds will require annotations.zip and api-versions.xml
in prebuilts/sdk.

Bug: 153485543
Test: forrest
Change-Id: Ice23230c57b9ed30541a6dcb6f507b765e6a03fe
2020-07-06 11:20:07 -07:00
Colin Cross
18b3f5f895 Package core-current-stubs-for-system-modules into the SDK
core-current-stubs-for-system-modules needs to be distributed
in the SDK to allow apps to be built with javac -source 9 -target 9.

Bug: 143209928
Test: m TARGET_PRODUCT=sdk_phone_x86 TARGET_BUILD_VARIANT=userdebug sdk sdk_repo dist
Change-Id: I9d67344f159f9482567323f27c5a8e4e060e1f1a
Merged-In: I9d67344f159f9482567323f27c5a8e4e060e1f1a
(cherry picked from commit 89c5517a28)
2020-04-22 08:59:03 -07:00
Colin Cross
89c5517a28 Package core-current-stubs-for-system-modules into the SDK
core-current-stubs-for-system-modules needs to be distributed
in the SDK to allow apps to be built with javac -source 9 -target 9.

Bug: 143209928
Test: m TARGET_PRODUCT=sdk_phone_x86 TARGET_BUILD_VARIANT=userdebug sdk sdk_repo dist
Change-Id: I9d67344f159f9482567323f27c5a8e4e060e1f1a
2020-04-17 18:18:18 -07:00
Aurimas Liutikas
3219aad274 Move to framework-doc-stubs module for versions xml and annotations
api-versions.xml and annotations.zip will now be taken from framework-doc-stubs
module so that api-stubs-docs can stop generating them.

Test: lunch sdk; make sdk
Bug: 151160048
Change-Id: I35fdba553318098a09249f47d7d78cdef79f3898
Merged-in: I35fdba553318098a09249f47d7d78cdef79f3898
2020-03-23 18:53:17 +00:00
Anton Hansson
858113cdae Add module_lib and system-server artifacts to sdk dist
Makes these artifacts available for the update_prebuilts script.

Bug: 149293194
Test: m win_sdk dist && find out/dist -type f
Change-Id: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
Merged-In: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
(cherry picked from commit b4aca10721)
2020-03-20 15:22:23 +00:00
Anton Hansson
b4aca10721 Add module_lib and system-server artifacts to sdk dist
Makes these artifacts available for the update_prebuilts script.

Bug: 149293194
Test: m win_sdk dist && find out/dist -type f
Change-Id: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
2020-03-19 19:20:32 +00:00
Aurimas Liutikas
1a6d508576 Move to framework-doc-stubs module for versions xml and annotations
api-versions.xml and annotations.zip will now be taken from framework-doc-stubs
module so that api-stubs-docs can stop generating them.

Test: lunch sdk; make sdk
Change-Id: I35fdba553318098a09249f47d7d78cdef79f3898
2020-03-12 16:26:06 -07:00
Colin Cross
76aa9e1b65 Package framework.aidl produced by Soong
Bug: 130798034
Test: forrest
Change-Id: Ie5606eeace783b09e822b7045880f57f7fb8dab1
2019-04-18 12:10:41 -07:00
Jaewoong Jung
3626b04613 Recompress android.jar before packaging it.
This is to circumvent an issue where Q SDK release causes a problem to
developers who are stuck with an old Gradle version.

Fixes: 127733650
Test: m sdk & inspect android.jar size and contents
Change-Id: I52a211f57afba1b6d656bba2082e806481ef41c2
2019-03-14 07:30:54 -07:00
Treehugger Robot
4d9ea2c551 Merge "Add the dist path of android stubs files" 2018-09-20 00:37:22 +00:00
Sundong Ahn
f4b9f6edc2 Add the dist path of android stubs files
The dist path of the android stubs files are added for consistency of
dist path.

Test: make -j50 PRODUCT-sdk_phone_armv7-sdk dist
Change-Id: I7d1d981f1e99cf12b45af5aa757d350d9a8de3eb
2018-09-19 12:30:29 +09:00
Nan Zhang
38f1f3b9f5 Bundle Metalava based api-versions.xml to SDK
Since Metalava has the ability to generate api-versions.xml, so just
remove the old ones, and ship the new file to SDK.

Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I007fd17b6e0f069f0d9dd9eac192f5e915be5f7a
Merged-In: I007fd17b6e0f069f0d9dd9eac192f5e915be5f7a
2018-09-19 01:57:17 +00:00
Nan Zhang
18babf6827 Remove Metalava related targets in development.
Since api-stubs-docs have been deleted and replaced by Metalava.

Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I6dc8b8f903f77699b90cd5e28c55f74c14a20b54
Merged-In: I6dc8b8f903f77699b90cd5e28c55f74c14a20b54
2018-08-07 16:07:33 -07:00
Nan Zhang
7ef23e5e55 Merge "Use android.jar from Metalava."
am: e973f6de0f

Change-Id: I6ad90d2a1d87f99932760f41dc61dd5d4ba56be4
2018-07-24 17:06:36 -07:00
Tor Norbye
58ab9ef051 Use android.jar from Metalava.
This CL only affects the SDK.

It reverts commit 91967398ad
and then updates the packaging source for android.jar to
the metalava jar.

It also packages the extracted annotations, annotations.zip.

Test: Manually built various apps with android.jar file
  as well as some binary verification with javap
Bug: 78245848

Change-Id: I5614a7f5af11d12c99cf0275ae0a88d97cc0bbc7
(cherry-picked from f13bb3dab6)
2018-06-26 13:22:46 -07:00
Dan Willemsen
dc5dc10dcd Merge "Convert implicit make rules to static pattern rules"
am: 56ded7fe40

Change-Id: I7aa17d859e487b0b7e9d4b7af0cf1e4c2a7ff02f
2018-06-16 14:47:23 -07:00
Dan Willemsen
55a8f53068 Convert implicit make rules to static pattern rules
Implicit rules are being deprecated, so explicitly specify which targets
to apply the pattern rules against.

Test: build-aosp_arm.ninja is identical before/after
Change-Id: I0b902dbbfa7a70abcdcce5ea1954e9e4fad25367
2018-06-16 10:41:44 -07:00
Jiyong Park
3ae7694f41 Stubs lib for org.apache.http.legacy is changed to -.stubs.
Stubs lib for the sdk library org.apache.http.legacy is renamed to
org.apache.http.legacy.stubs, because the lib is now built using the
standardized build script 'java_sdk_library' where stubs libs are
suffixed with .stubs.

Bug: 77577799
Test: m -j
Merged-In: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
Change-Id: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
(cherry picked from commit 5579c00e56)
2018-05-22 20:42:10 +09:00
Jiyong Park
d06181a427 Stubs lib for org.apache.http.legacy is changed to -.stubs.
Stubs lib for the sdk library org.apache.http.legacy is renamed to
org.apache.http.legacy.stubs, because the lib is now built using the
standardized build script 'java_sdk_library' where stubs libs are
suffixed with .stubs.

Bug: 77577799
Test: m -j
Merged-In: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
Change-Id: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
(cherry picked from commit 5579c00e56)
2018-05-22 20:15:32 +09:00
Anton Hansson
add2d257b0 Merge "development: Update path to android.jar." am: 87cc3e369c
am: 7c9ea6b065

Change-Id: I5ee534d8ee7ffd676a75298695221c18b1ecff73
2018-05-02 09:28:48 -07:00
Anton Hansson
8447737005 development: Update path to android.jar.
This file is being moved. Update this path so that the old file ca be
deleted.

Bug: 77525052
Test: make out/host/linux-x86/development/sdk/generated-api-versions.xml
Change-Id: I3802304a69cc21be26e13de63c5d459b803052dd
2018-05-01 17:53:55 +01:00
Jiyong Park
3e255758be javalib.jar -> classes.jar for the stubs included in SDK
I6730e2d3ec38004874265b2a690442dec57b33f4 made it clear that we should
depend on classes.jar for static java libraries. However, due to the
existing references to javalib.jar, the build system has been copied
classes.jar to javalib.jar.

But, this is not the case for Soong-defined java libraries. Instead of
doing the same thing for Soong-defined modules, directly fixing the
case where javalib.jar is being referenced.

Test: m -j dist
Bug: b/70351683

Merged-In: Iabd04ba55411373c228ca4bf04fc99b7f155262c
Change-Id: Iabd04ba55411373c228ca4bf04fc99b7f155262c
(cherry-picked from cdd757f4da)
2018-04-12 14:56:19 -07:00
Jiyong Park
e43dd95e8f javalib.jar -> classes.jar for the stubs included in SDK
I6730e2d3ec38004874265b2a690442dec57b33f4 made it clear that we should
depend on classes.jar for static java libraries. However, due to the
existing references to javalib.jar, the build system has been copied
classes.jar to javalib.jar.

But, this is not the case for Soong-defined java libraries. Instead of
doing the same thing for Soong-defined modules, directly fixing the
case where javalib.jar is being referenced.

Test: m -j dist

Merged-In: Iabd04ba55411373c228ca4bf04fc99b7f155262c
Change-Id: Iabd04ba55411373c228ca4bf04fc99b7f155262c
2018-03-30 15:49:03 +09:00
Nan Zhang
1c7b1a13bd Generate Soong based (system/test_)stubs_current jar
And remove build_android_stubs.mk
Bug: b/70351683

Test: m soong_android_stubs_current
cp out/soong/.intermediates/development/build/soong_android_stubs_current/android_common/combined/soong_android_stubs_current.jar new/ &&
cp out/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/classes.jar old/ &&
cd new/; find . -type f -name "*.class" -exec md5sum {} \+ | ( cd old; md5sum -c --quiet )

zipinfo > entries.toc, results are identical.

Change-Id: I24013e20481392e15ef6362c5cc239740531625f
Merged-In: I24013e20481392e15ef6362c5cc239740531625f
2018-03-20 16:23:36 -07:00
Nan Zhang
394d86b3cd Generate Soong based (system/test_)stubs_current jar
And remove build_android_stubs.mk
Bug: b/70351683

Test: m soong_android_stubs_current
cp out/soong/.intermediates/development/build/soong_android_stubs_current/android_common/combined/soong_android_stubs_current.jar new/ &&
cp out/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/classes.jar old/ &&
cd new/; find . -type f -name "*.class" -exec md5sum {} \+ | ( cd old; md5sum -c --quiet )

zipinfo > entries.toc, results are identical.

Change-Id: I24013e20481392e15ef6362c5cc239740531625f
Merged-In: I24013e20481392e15ef6362c5cc239740531625f
2018-03-20 11:29:54 -07:00
Paul Duffin
33b4ede5a5 Add stubs for android.test.base
Adds android.test.base.jar to the optional directory of the SDK.

Bug: 30188076
Test: build SDK and check optional directory

Change-Id: Idef6358ea435053ee08831cefa8be5d07c9c6f74
2017-11-29 10:48:30 +00:00
Paul Duffin
317f8c8372 Add stubs for android.test.mock, android.test.runner
Adds android.test.mock.jar and android.test.runner.jar to
the optional directory of the SDK.

Bug: 30188076
Test: build SDK and check optional directory
Change-Id: I6fb0d8757c4b157ff2167f8fc4e50ff019449beb
2017-10-31 13:48:21 +00:00
Colin Cross
8b34196af3 Delete jack support
Remove references to jack files that no longer exist.

Bug: 65302138
Test: m PRODUCT-sdk_phone_x86_64-sdk dist sdk_repo
Change-Id: I6e68fbffc49362ec691db966032e8e01d5f01756
Merged-In: I6e68fbffc49362ec691db966032e8e01d5f01756
(cherry picked from commit cfcfb28d9a)
2017-10-02 21:04:28 +00:00
Colin Cross
387a987001 Merge "Delete jack support" 2017-10-02 21:03:41 +00:00
Colin Cross
cfcfb28d9a Delete jack support
Remove references to jack files that no longer exist.

Bug: 65302138
Test: m PRODUCT-sdk_phone_x86_64-sdk dist sdk_repo
Change-Id: I6e68fbffc49362ec691db966032e8e01d5f01756
2017-10-02 12:27:22 -07:00
Ivan Gavrilovic
b6d3f47313 Add shrinkedAndroid.jar to build tools
Test: built the sdk locally
Change-Id: Ifb2a88e715b4bb2f1077aaed4fd724b3a13cbe2d
2017-09-28 17:23:42 +01:00
Colin Cross
155250203f Add core-lambda-stubs.jar to the SDK
core-lambda-stubs.jar will be used to provide an empty
LambdaMetafactory when compiling with javac.

Bug: 65210042
Test: m -j PRODUCT-sdk-win_sdk sdk_repo
Change-Id: Icfef901806b758a0ace2b1937b26b2c3ae00a3d1
2017-09-22 09:12:05 -07:00
Colin Cross
59ddf611a1 Merge "Use make variables to access java tools"
am: d82b8eb5ce

Change-Id: Ic686f920d55d11ca764a795ddbd5d80b6de94f55
2017-07-06 22:55:52 +00:00
Colin Cross
fff9b6e6e9 Use make variables to access java tools
Use make variables like $(JAVA) to access java tools in preparation
for moving java tools out of the path.

Test: builds
Bug: 62956999
Change-Id: I0bbe109437c80aca23d8e56188ad7e90c93ddaee
2017-07-01 01:04:54 +00:00
Sergey Prigogin
fc2e8eaf31 New version of api-generator tool
The new version produces api-versions.xml file with API removal
information. The format of the file is backward compatible.

Test: api-generator was tested as part of ag/2298689
Bug: 37127307
Change-Id: I0db84363b973a2c6076dcb42033a09a5566ff9f1
(cherry picked from commit 1c6c892938)
(cherry picked from commit a9bb8f2687f7c879be8b2bacf420e6e116ca245b)
2017-06-22 17:59:39 +00:00
Alan Viverette
af9c8f24f7 Restore "Remove Support Library from SDK build"
This reverts commit 5e690a21eb.

Test: make -j29 PRODUCT-sdk_phone_mips-sdk sdk_repo
Change-Id: I5aff9d6792a50b6e8eaca396a189724b4043bc81
2017-03-18 06:00:56 -04:00