diff options
author | Jeongik Cha <jeongik@google.com> | 2019-06-25 16:26:18 +0900 |
---|---|---|
committer | Jeongik Cha <jeongik@google.com> | 2019-06-28 14:56:59 +0900 |
commit | 6bd33c13bb552d3eee52bcc553b35d55dd91fe98 (patch) | |
tree | dc2e0fbb2e22815893b95a06d37ab27ca156ae12 /java/java.go | |
parent | 7dc6951c3d7a7495a03d97cf13084be78f1896e7 (diff) |
Enforce hidden api usage in vendor (soong)
From aosp/588578, if vendor app doesn't fill sdk_version, build scirpt overwrites system_current to sdk_version.
But there is no similar enforcement in soong.
So, as make does, sdkVersion() returns "system_current" if it is device-specific or soc-specific module. and sdk_version is not filled.
Test: pass soong test
Bug: 132780927
Change-Id: I69bb3d7bfcf7c27c2db4d0efbe046f9c7879b4bc
Diffstat (limited to 'java/java.go')
-rw-r--r-- | java/java.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index a2e9ab023..037843686 100644 --- a/java/java.go +++ b/java/java.go @@ -426,6 +426,18 @@ var ( usesLibTag = dependencyTag{name: "uses-library"} ) +func defaultSdkVersion(ctx checkVendorModuleContext) string { + if ctx.SocSpecific() || ctx.DeviceSpecific() { + return "system_current" + } + return "" +} + +type checkVendorModuleContext interface { + SocSpecific() bool + DeviceSpecific() bool +} + type sdkDep struct { useModule, useFiles, useDefaultLibs, invalidVersion bool @@ -465,7 +477,7 @@ func (j *Module) shouldInstrumentStatic(ctx android.BaseModuleContext) bool { } func (j *Module) sdkVersion() string { - return String(j.deviceProperties.Sdk_version) + return proptools.StringDefault(j.deviceProperties.Sdk_version, defaultSdkVersion(j)) } func (j *Module) minSdkVersion() string { @@ -1869,7 +1881,7 @@ type Import struct { } func (j *Import) sdkVersion() string { - return String(j.properties.Sdk_version) + return proptools.StringDefault(j.properties.Sdk_version, defaultSdkVersion(j)) } func (j *Import) minSdkVersion() string { |