diff options
| author | Sundong Ahn <sundongahn@google.com> | 2017-10-17 16:34:51 +0900 |
|---|---|---|
| committer | Sundong Ahn <sundongahn@google.com> | 2017-12-01 00:41:59 +0000 |
| commit | 0926fae350a86fa1ea008d8fde95391bd6ed0ca0 (patch) | |
| tree | fecf4611f6f75ff6dbd17b5ea9fb643e832d561c /java | |
| parent | 85c87cef014bd4369af347ab8a108c0549d569d9 (diff) | |
| download | android_build_soong-0926fae350a86fa1ea008d8fde95391bd6ed0ca0.tar.gz android_build_soong-0926fae350a86fa1ea008d8fde95391bd6ed0ca0.tar.bz2 android_build_soong-0926fae350a86fa1ea008d8fde95391bd6ed0ca0.zip | |
Add system_$(VER)
The system_$(VER) is added for vendor, similar to sdk.
Bug: 67724799
Test: build
Merged-In: I2545c92707591ca278066870c74e9f49e9825855
Change-Id: I2545c92707591ca278066870c74e9f49e9825855
(cherry picked from commit b8baff1fa353a311c3dd918dfa29ec45dd0168be)
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 10 | ||||
| -rw-r--r-- | java/java_test.go | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index f875c799..4355200f 100644 --- a/java/java.go +++ b/java/java.go @@ -251,7 +251,7 @@ func sdkStringToNumber(ctx android.BaseContext, v string) int { case "", "current", "system_current", "test_current": return 10000 default: - if i, err := strconv.Atoi(v); err != nil { + if i, err := strconv.Atoi(android.GetNumericSdkVersion(v)); err != nil { ctx.PropertyErrorf("sdk_version", "invalid sdk version") return -1 } else { @@ -275,6 +275,12 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep { aidlPath := android.ExistentPathForSource(ctx, "sdkdir", aidl) if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() { + if strings.Contains(v, "system_") { + return sdkDep{ + invalidVersion: true, + module: "vsdk_v" + strings.Replace(v, "system_", "", 1), + } + } return sdkDep{ invalidVersion: true, module: "sdk_v" + v, @@ -887,7 +893,7 @@ func (j *Module) minSdkVersionNumber(ctx android.ModuleContext) string { case "", "current", "test_current", "system_current": return strconv.Itoa(ctx.Config().DefaultAppTargetSdkInt()) default: - return String(j.deviceProperties.Sdk_version) + return android.GetNumericSdkVersion(String(j.deviceProperties.Sdk_version)) } } diff --git a/java/java_test.go b/java/java_test.go index 0a9eba94..5b364279 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -139,6 +139,8 @@ func testJavaWithEnvFs(t *testing.T, bp string, "prebuilts/sdk/current/framework.aidl": nil, "prebuilts/sdk/system_current/android.jar": nil, "prebuilts/sdk/system_current/framework.aidl": nil, + "prebuilts/sdk/system_14/android.jar": nil, + "prebuilts/sdk/system_14/framework.aidl": nil, "prebuilts/sdk/test_current/android.jar": nil, "prebuilts/sdk/test_current/framework.aidl": nil, @@ -286,6 +288,14 @@ var classpathTestcases = []struct { }, { + name: "system_14", + properties: `sdk_version: "system_14",`, + bootclasspath: []string{`""`}, + system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath + classpath: []string{"prebuilts/sdk/system_14/android.jar"}, + }, + { + name: "test_current", properties: `sdk_version: "test_current",`, bootclasspath: []string{`""`}, |