aboutsummaryrefslogtreecommitdiffstats
path: root/java/droiddoc.go
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-10-31 15:28:47 -0700
committerDan Willemsen <dwillemsen@google.com>2018-10-31 21:37:34 -0700
commit419290aba90e8b8a97e5dc09aad0c3c9aa420ece (patch)
tree6df6592108d2d587a3503775b82a7517641f6c05 /java/droiddoc.go
parentb259ede3249df172ed5ba0191547c715f241441c (diff)
downloadandroid_build_soong-419290aba90e8b8a97e5dc09aad0c3c9aa420ece.tar.gz
android_build_soong-419290aba90e8b8a97e5dc09aad0c3c9aa420ece.tar.bz2
android_build_soong-419290aba90e8b8a97e5dc09aad0c3c9aa420ece.zip
Support setting target_sdk_version separately from sdk_version
Before this change, if targetSdkVersion wasn't set in the AndroidManifest.xml, we'd set it to the sdk_version from the Android.bp. But there are cases where you want to compile against a later SDK, but target an earlier one (especially if you depend on libraries that need to be compiled against more recent SDKs, like androidx). Test: build APK with different target_sdk_version. Change-Id: Iaed36b522955a374a049ef331158cc8fc5798ad2
Diffstat (limited to 'java/droiddoc.go')
-rw-r--r--java/droiddoc.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 23614ec6..b724e154 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -484,6 +484,10 @@ func (j *Javadoc) minSdkVersion() string {
return j.sdkVersion()
}
+func (j *Javadoc) targetSdkVersion() string {
+ return j.sdkVersion()
+}
+
func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) {
if ctx.Device() {
if !Bool(j.properties.No_standard_libs) {