Commit Graph

103 Commits

Author SHA1 Message Date
Sergey Prigogin
1c6c892938 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
2017-05-30 11:31:45 -07: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
Teng-Hui Zhu
67731bcc07 Add the VDC and AVDC to the SDK zip file
am: 9429d9f590

* commit '9429d9f590d413063a2b76b14b4e4c1215853b54':
  Add the VDC and AVDC to the SDK zip file
2016-03-10 17:39:02 +00:00
Teng-Hui Zhu
9429d9f590 Add the VDC and AVDC to the SDK zip file
b/27522762

Change-Id: Iff9d72f6dcda57064a2310e57323ebd283b21198
2016-03-09 09:30:10 -08:00
Tor Norbye
4a3b43c457 Use api-generator 25 when buiding api-versions.xml
The new api-generator prebuilt fixes a bug where adding
"implements Interface" where Interface is already implemented
by a parent class would be treated as a newly added interface
on this class in the API version the subclass added the implements
statement. (This caused LinkedHashMap to be shown as only adding
the Map interface in API 24.)

Change-Id: I8a9e3971d8be3c4af2a2f68380486e77fe828444
2016-02-18 19:11:41 +00:00
Tor Norbye
6bb9311fbe Update to api-generator 22.9.4.
The new API generator uses ASM 5.0.4 instead of 4.0, which makes
it capable of handling class files format 52. It also drops the
dependency on the SDK common jar and only depends on Guava (and
ASM), using the offline Maven repository directly.

(cherry-picked from commit 1d7a69a635)

Change-Id: Ia8322366f4a8f7a70610d07104375f53d54aab01
2016-02-16 13:40:29 +00:00
Narayan Kamath
e54bbd8e64 Include source jar for generated stubs in the SDK.
(cherry picked from commit b6e4261bc200c17986a753eb239f313e4b4ef2f8)

Change-Id: I6675d023a9270afac83e8fc1313b114b722d9712
2016-02-12 10:41:04 +00:00
Tor Norbye
1d7a69a635 Update to api-generator 22.9.4.
The new API generator uses ASM 5.0.4 instead of 4.0, which makes
it capable of handling class files format 52. It also drops the
dependency on the SDK common jar and only depends on Guava (and
ASM), using the offline Maven repository directly.

Change-Id: I2978d514fe7653465200612943593e10662327c9
2016-02-02 19:49:24 -08:00
Michael Wright
a2595fc6e2 Add new test API stub jar for building CTS against.
Bug: 25608286
Change-Id: I996745b2ace09d5287b1eccd02662aefdb7eba4d
2015-11-25 11:38:45 +00:00
Yohann Roussel
eeaccc2291 am 03ae930a: am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"
* commit '03ae930a7382b0c58640449dd115d4fcc33970e6':
  Pick installed Jack & Jill for the sdk
2015-09-15 07:46:21 +00:00
Yohann Roussel
03ae930a73 am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"
* commit '9e2e8392ae22051d775e093e6faba721d8b919eb':
  Pick installed Jack & Jill for the sdk
2015-09-15 07:38:40 +00:00
Tony Mantler
7348e2bd96 am 013441f2: resolved conflicts for merge of fab9a1f2 to mnc-dr-dev-plus-aosp
* commit '013441f2965fecad98ad3b57251bee75c09aac99':
  Add preference and recommendation libs to SDK build
2015-08-28 23:14:09 +00:00
Tony Mantler
fab9a1f267 Add preference and recommendation libs to SDK build
Change-Id: I00c716c42ffbd04b382b1b3016fcc19e9321ae48
2015-08-28 13:29:54 -07:00
Yusuf Ozuysal
3ffdd09560 am 7615d828: am ac16badc: am e226a0f5: Add customtabs support lib to extras/android/support/
* commit '7615d828163653f0260bb384b95ec4d06f61fb22':
  Add customtabs support lib to extras/android/support/
2015-08-27 22:17:46 +00:00
Tor Norbye
68b4f8d92f am 51397c4b: am 1f2c59af: Merge "Pass in current android.jar to api-generator" into mnc-ub-dev
* commit '51397c4b4434d5a375382237ce5fc40db18deb9a':
  Pass in current android.jar to api-generator
2015-08-27 22:17:40 +00:00
Yusuf Ozuysal
ac16badc76 am e226a0f5: Add customtabs support lib to extras/android/support/
* commit 'e226a0f56949b1d6ab97a31ed987adb7f7513be9':
  Add customtabs support lib to extras/android/support/
2015-08-27 21:42:54 +00:00
Yusuf Ozuysal
e226a0f569 Add customtabs support lib to extras/android/support/
Currently the only way to get access to customtabs library through
download m2repository and using the aar file whereas all other
support libs are also present in extras/android/support/ with
the corresponding resources and jar file.

This adds the jar and manifest to the corresponding folder to avoid
the confusion to developers.

This is relanding
https://googleplex-android-review.git.corp.google.com/#/c/756492/
after it was reverted due to not having the corresponding Android.mk
change.

Change-Id: I21969994e1dd0bb4f9abbfa395cf284e3cfc396d
2015-08-27 18:29:07 +00:00
Tor Norbye
fbe6c8105a Pass in current android.jar to api-generator
This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469
2015-08-26 01:39:51 +00:00
Yohann Roussel
8c61bb43f3 Pick installed Jack & Jill for the sdk
(cherry picked from commit 7ca5ad69db)

Change-Id: Ied8d420f05012e2072f11bb7c63fd3c53afa664e
2015-08-05 11:47:45 +02:00
Yohann Roussel
7ca5ad69db Pick installed Jack & Jill for the sdk
Change-Id: I3dc4ecc83f07d2c8eea72b5d08fa2fe20bfbb6bf
2015-07-22 14:31:21 +00:00
Filip Gruszczynski
38c6c69da2 am ab748c01: Merge "Sample for percent support library." into lmp-mr1-ub-dev
* commit 'ab748c0115a72c44c22baca1db961c9a35b1c277':
  Sample for percent support library.
2015-05-14 00:43:26 +00:00
Tor Norbye
9c30464eb1 Use new api-generator version: extracts deprecation info
This reverts commit 9f09636474.
2015-05-09 11:36:25 -07:00
Tor Norbye
9f09636474 Revert "Use new api-generator version: extracts deprecation info"
This reverts commit 833bdc79d8.

Change-Id: Ib08294a39b03c7831ffebf83487b9c6564401c31
2015-05-09 14:56:23 +00:00