diff options
| author | 2019-06-25 16:26:18 +0900 | |
|---|---|---|
| committer | 2019-06-28 14:56:59 +0900 | |
| commit | 6bd33c13bb552d3eee52bcc553b35d55dd91fe98 (patch) | |
| tree | dc2e0fbb2e22815893b95a06d37ab27ca156ae12 /java/aar.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/aar.go')
| -rw-r--r-- | java/aar.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/aar.go b/java/aar.go index 47f6e5f6a..a2c203fcb 100644 --- a/java/aar.go +++ b/java/aar.go @@ -499,7 +499,7 @@ type AARImport struct { } func (a *AARImport) sdkVersion() string { - return String(a.properties.Sdk_version) + return proptools.StringDefault(a.properties.Sdk_version, defaultSdkVersion(a)) } func (a *AARImport) minSdkVersion() string { |