diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2017-05-03 14:15:43 -0700 |
|---|---|---|
| committer | Rashed Abdel-Tawab <rashed@linux.com> | 2017-10-28 13:53:58 -0700 |
| commit | 3b2d052417972a415c23f3b148b4f53f290dcf73 (patch) | |
| tree | 8bbd86d43aef3de6a64acf786f226f80640bcd60 | |
| parent | cc692a6be014396d25669e3ae2720b0db64332fe (diff) | |
| download | android_development-3b2d052417972a415c23f3b148b4f53f290dcf73.tar.gz android_development-3b2d052417972a415c23f3b148b4f53f290dcf73.tar.bz2 android_development-3b2d052417972a415c23f3b148b4f53f290dcf73.zip | |
DO NOT MERGE - Fix api-versions.xml
Don't pass $(PLATFORM_VERSION_CODENAME) to the api-generator if
the $(PLATFORM_SDK_VERSION) is already greater than the previous
API version. Otherwise this will prevent the current android.jar
APIs from being included in the generated api-versions.xml.
Bug: 37946094
Test: lunch sdk_phone_armv7-win_sdk && make -j8
Change-Id: I7591bbf1b2c396dd6b070ddc04a0cfbf8dfc154b
| -rw-r--r-- | build/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/Android.mk b/build/Android.mk index f3fc8a51a..097955c2e 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -130,14 +130,13 @@ api_gen_deps := \ $(TOPDIR)prebuilts/tools/common/m2/repository/com/google/guava/guava/17.0/guava-17.0.jar api_gen_classpath := $(subst $(space),:,$(api_gen_jar) $(api_gen_deps)) - +# TODO: Pass '--current-codename $(PLATFORM_VERSION_CODENAME)' to bump PLATFORM_SDK_VERSION. $(HOST_OUT)/development/sdk/generated-api-versions.xml: $(android_jar_full_target) java -cp $(api_gen_classpath) \ com.android.apigenerator.Main \ --pattern $(TOPDIR)prebuilts/tools/common/api-versions/android-%/android.jar \ --pattern $(TOPDIR)prebuilts/sdk/%/android.jar \ --current-version $(PLATFORM_SDK_VERSION) \ - --current-codename $(PLATFORM_VERSION_CODENAME) \ --current-jar $(android_jar_full_target) \ $@ |