Commit Graph

124 Commits

Author SHA1 Message Date
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
Alan Viverette
5e690a21eb Revert "Remove Support Library from SDK build" to fix build
This reverts commit 0ff1cf9d4d.

Change-Id: I320a19b78324cc895428cb5ae078fb2191959817
2017-03-18 01:49:38 +00:00
Alan Viverette
0ff1cf9d4d Remove Support Library from SDK build
The Support Library ships separately via SDK Manager. It should not be
included in the base SDK build. Also, the version was wrong and it was
missing several modules.

Bug: 36171385
Test: make sdk
Change-Id: I827429b13adc2bfebf1620413f879227513a294a
2017-03-17 12:40:05 -04:00
Alan Viverette
91eed12fb0 Update SDK build for recently-added support library modules
Bug: 35707648
Test: make sdk
Change-Id: I6b5991b0544492ec2db8b66ab7eb7c17af8ba882
2017-03-16 15:17:11 -04:00
Doris Liu
d69f0a2fd8 Add dynamic-animation to sdk build
Change-Id: I6ab7c6b110b98c60f550b331ed7525849e394c36
2017-03-06 11:23:22 -08:00
Yohann Roussel
9bcc30a78a Merge "Deliver android-support-multidex.jack in SDK" am: da07dcd7f9 am: d29421db99 am: 32e1696537
am: 4fe4e0dafe

Change-Id: I672e73971578877a8c37c1887ea1201e6e12937c
2016-12-05 15:50:22 +00:00
Yohann Roussel
d29421db99 Merge "Deliver android-support-multidex.jack in SDK"
am: da07dcd7f9

Change-Id: I7e9e51ade83f3cc2b7d141a45ec1a43fac804b4e
2016-12-05 15:36:50 +00:00
Yohann Roussel
19b848f707 Deliver android-support-multidex.jack in SDK
Bug: https://code.google.com/p/android/issues/detail?id=224026
Test: make PRODUCT-sdk-win_sdk sdk_repo
Change-Id: Iecc0f7bc5c3518d9ac81111a52f8a7b3ecbcc717
2016-11-30 20:07:04 +01:00
Tomasz Mikolajewski
9340eb863d Remove documents-archive support library from O.
Test: Compiles.
Bug: 31783726
Change-Id: I9b14bee8077d0e9f04a9c77b4a5a92192c2312de
2016-10-24 10:44:49 +09:00
Alan Viverette
703cb89fc7 Include android-support-transition library in SDK build am: 52d949c7e8
am: 9ae0c8a436

Change-Id: Ia1791aa02b981dc4c42c35705118905ee0c8fecd
2016-09-22 20:09:07 +00:00
Alan Viverette
52d949c7e8 Include android-support-transition library in SDK build
Also sorts the list of libraries so that it's easier to see when things
are missing.

Bug: 31645726
Test: built the SDK, verified build artifacts
Change-Id: Ic52e0fd6362087eb4653baf9137ff09b9945d994
2016-09-22 11:18:17 -04:00
Kirill Grouchnikov
91c3e2f789 Merge changes necessary to build refactored support library
am: ce69622596

Change-Id: Ie80be720148fea68f1afc1a01671b53b14b16843
2016-07-02 18:58:54 +00:00
Kirill Grouchnikov
ce69622596 Merge changes necessary to build refactored support library 2016-07-01 22:37:43 -04:00
Sebastien Hertz
882fd85a9b Add jack-jacoco-plugin.jar to build tools
Bug: 28945296

(cherry picked from commit fa52ee31da)

Change-Id: I02692a8f6495c280005130704c46f4620f1fd3e2
2016-05-25 16:20:19 +02:00
Sebastien Hertz
46d7d6ade6 Merge "Add jack-jacoco-plugin.jar to build tools" am: a5066ffc45
am: 3192e6d962

* commit '3192e6d962b4d3e44f234fea63292e74ff3caf32':
  Add jack-jacoco-plugin.jar to build tools

Change-Id: Ia7b3f7b5ddaab1870f23fa4e18a3f4f2f90a442f
2016-05-25 13:22:24 +00:00
Sebastien Hertz
fa52ee31da Add jack-jacoco-plugin.jar to build tools
Bug: 28945296
Change-Id: Ica695a24409fb7caabb50b39e27b066336590958
2016-05-25 10:51:08 +02:00
Alan Viverette
29f20dae99 Merge "Add documents-archive to list of support libraries" into nyc-dev
am: 1a44969bce

* commit '1a44969bce4e65524feb4b4ba2679f20c8b6a398':
  Add documents-archive to list of support libraries

Change-Id: I32d5b77959619b6e30a9f10be45b170a181da4c6
2016-05-19 19:48:44 +00:00
Alan Viverette
9c386f79f1 Add documents-archive to list of support libraries
Bug: 28762753
Change-Id: Idb4a22c9eb3de50cc95db3b01070ec291f81f84c
2016-05-13 18:21:50 +00:00
Ying Wang
c342196249 resolve merge conflicts of b97dd87 to nyc-dev-plus-aosp
Change-Id: I708720fd21d86339be9f6d55be03cf89ebf6075d
2016-05-11 19:51:33 -07:00
Ying Wang
b97dd87037 Delete R.class/etc. in support library jar files shipped in SDK
We need to keep the resoruce generated class files in the support
libraries' built jar files when compiling with javac,
with the introduction of LOCAL_SHARED_ANDROID_LIBRARIES support of aapt2.
We strip them  when packaging up the SDK package in this change.

Bug: 28454725
Bug: 22775504
Change-Id: Id5fb30915e698887e5a8d92f26d4ac8f3159613a
2016-05-11 18:14:47 -07:00
Sebastien Hertz
524a11ef81 Add jack-jacoco-reporter.jar to build tools
Bug: 27989323

(cherry picked from commit c0f1caa598)

Change-Id: Iab1e4ae3283ea0a4e09536916d09f96962371cf9
2016-04-05 15:26:29 +02:00
Sebastien Hertz
5581d3c4c0 Merge "Add jack-jacoco-reporter.jar to build tools" am: f26b07f
am: 640137c

* commit '640137c9238fd98821e8451d6cdb47a3ef43eda8':
  Add jack-jacoco-reporter.jar to build tools

Change-Id: I408a66fd35f7dca4fa165370441931132087e266
2016-04-05 12:41:50 +00:00
Sebastien Hertz
c0f1caa598 Add jack-jacoco-reporter.jar to build tools
Bug: 27989323
Change-Id: I07a58d4e800866238cf0c721e80099a12fa37233
2016-04-05 09:41:42 +02:00
Dan Willemsen
15348ea4aa Merge "Replace custom rules, remove ACP"
am: a279b12

* commit 'a279b12905f31231a8f3c36c52abcd1224449c1a':
  Replace custom rules, remove ACP
2016-03-23 22:02:06 +00:00
Dan Willemsen
f230a38299 Replace custom rules, remove ACP
A few LOCAL_ADDITIONAL_DEPENDENCIES were required, where
LOCAL_REQUIRED_MODULES would be nicer, but you can't require a module of
the same name. It would create a dependency loop with the current
require implementation, so it's filtered by the build system.

Also translate monkey from ALL_PREBUILTS to a prebuilt like the rest of
the tools. This doesn't change anything, since 'monkey' is already in
build/target/product/base.mk.

ACP is being removed, so use the standard build system macros to copy
files.

Change-Id: I4f73c6b35c0d7ae25467145b0a9d5c32ba4578d2
2016-03-23 13:22:38 -07:00
Yohann Roussel
26707bffbf Package Jack and Jill directly from prebuilt
Instead of taking it from out.

Bug: 27372042

(cherry picked from commit 6f5779692a)

Change-Id: I9cc798e37655c8e86bf781c42c7b57b76070a1fd
2016-03-18 11:39:37 +01:00
Yohann Roussel
2e8682bfaa Merge "Package Jack and Jill directly from prebuilt"
am: 241e156

* commit '241e1565faed018590fd618b92351a9f47bf4e12':
  Package Jack and Jill directly from prebuilt
2016-03-18 09:32:10 +00:00
Yohann Roussel
6f5779692a Package Jack and Jill directly from prebuilt
Instead of taking it from out.

Bug: 27372042
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
2016-03-17 15:16:25 +01:00