StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enforce hidden apis usage in product(soong)

Browse Source 
Only if PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE is set,
every app and java library in product cannot use hidden APIs anymore.

checkSdkVersion() checks if sdk_version of app and library is narrow enough,
checkLinkType() checks every library that app links agianst

Bug: 132780927
Test: m
Test: set PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE, and check whether build
error occurs.
Change-Id: Ic630503b875040f730feda4fef826ed6d71da111
This commit is contained in:
Jeongik Cha
2019-10-29 15:44:45 +09:00
parent af60d490ff
commit 2cc570dc63
8 changed files with 98 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
java/java_test.go
View File

@@ -27,6 +27,8 @@ import (
"android/soong/cc"
"android/soong/dexpreopt"
"android/soong/genrule"
"github.com/google/blueprint/proptools"
)
var buildDir string
@@ -228,9 +230,13 @@ func run(t *testing.T, ctx *android.TestContext, config android.Config) {
android.FailIfErrored(t, errs)
}
func testJavaError(t *testing.T, pattern string, bp string) {
func testJavaError(t *testing.T, pattern string, bp string) (*android.TestContext, android.Config) {
t.Helper()
return testJavaErrorWithConfig(t, pattern, bp, testConfig(nil))
}
func testJavaErrorWithConfig(t *testing.T, pattern string, bp string, config android.Config) (*android.TestContext, android.Config) {
t.Helper()
config := testConfig(nil)
ctx := testContext(bp, nil)
pathCtx := android.PathContextForTesting(config, nil)
@@ -240,20 +246,26 @@ func testJavaError(t *testing.T, pattern string, bp string) {
_, errs := ctx.ParseBlueprintsFiles("Android.bp")
if len(errs) > 0 {
android.FailIfNoMatchingErrors(t, pattern, errs)
return
return ctx, config
}
_, errs = ctx.PrepareBuildActions(config)
if len(errs) > 0 {
android.FailIfNoMatchingErrors(t, pattern, errs)
return
return ctx, config
}
t.Fatalf("missing expected error %q (0 errors are returned)", pattern)
return ctx, config
}
func testJava(t *testing.T, bp string) (*android.TestContext, android.Config) {
t.Helper()
config := testConfig(nil)
return testJavaWithConfig(t, bp, testConfig(nil))
}
func testJavaWithConfig(t *testing.T, bp string, config android.Config) (*android.TestContext, android.Config) {
t.Helper()
ctx := testContext(bp, nil)
run(t, ctx, config)
@@ -315,29 +327,38 @@ func TestSimple(t *testing.T) {
}
}
func TestSdkVersion(t *testing.T) {
ctx, _ := testJava(t, `
func TestSdkVersionByPartition(t *testing.T) {
testJavaError(t, "sdk_version must have a value when the module is located at vendor or product", `
java_library {
name: "foo",
srcs: ["a.java"],
vendor: true,
}
`)
testJava(t, `
java_library {
name: "bar",
srcs: ["b.java"],
}
`)
foo := ctx.ModuleForTests("foo", "android_common").Module().(*Library)
bar := ctx.ModuleForTests("bar", "android_common").Module().(*Library)
for _, enforce := range []bool{true, false} {
if foo.sdkVersion() != "system_current" {
t.Errorf("If sdk version of vendor module is empty, it must change to system_current.")
}
if bar.sdkVersion() != "" {
t.Errorf("If sdk version of non-vendor module is empty, it keeps empty.")
config := testConfig(nil)
config.TestProductVariables.EnforceProductPartitionInterface = proptools.BoolPtr(enforce)
bp := `
java_library {
name: "foo",
srcs: ["a.java"],
product_specific: true,
}
`
if enforce {
testJavaErrorWithConfig(t, "sdk_version must have a value when the module is located at vendor or product", bp, config)
} else {
testJavaWithConfig(t, bp, config)
}
}
}