Merge "Never allow java_library_host with no_standard_libs: true"
am: 393590d8a8
Change-Id: I088ad447dbc1ebd4fbbdb889523aca30b6b67624
diff --git a/android/neverallow.go b/android/neverallow.go
index ee3bf4a..ecff62d 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -52,6 +52,7 @@
rules = append(rules, createTrebleRules()...)
rules = append(rules, createLibcoreRules()...)
rules = append(rules, createJavaDeviceForHostRules()...)
+ rules = append(rules, createJavaLibraryHostRules()...)
return rules
}
@@ -127,6 +128,15 @@
}
}
+func createJavaLibraryHostRules() []*rule {
+ return []*rule{
+ neverallow().
+ moduleType("java_library_host").
+ with("no_standard_libs", "true").
+ because("no_standard_libs makes no sense with java_library_host"),
+ }
+}
+
func neverallowMutator(ctx BottomUpMutatorContext) {
m, ok := ctx.Module().(Module)
if !ok {
diff --git a/android/neverallow_test.go b/android/neverallow_test.go
index 40ccf14..9c43d53 100644
--- a/android/neverallow_test.go
+++ b/android/neverallow_test.go
@@ -178,6 +178,18 @@
}`),
},
},
+ // java_library_host rule tests
+ {
+ name: "java_library_host with no_standard_libs: true",
+ fs: map[string][]byte{
+ "libcore/Blueprints": []byte(`
+ java_library_host {
+ name: "inside_core_libraries",
+ no_standard_libs: true,
+ }`),
+ },
+ expectedError: "module \"inside_core_libraries\": violates neverallow",
+ },
}
func TestNeverallow(t *testing.T) {
@@ -200,6 +212,7 @@
ctx := NewTestContext()
ctx.RegisterModuleType("cc_library", ModuleFactoryAdaptor(newMockCcLibraryModule))
ctx.RegisterModuleType("java_library", ModuleFactoryAdaptor(newMockJavaLibraryModule))
+ ctx.RegisterModuleType("java_library_host", ModuleFactoryAdaptor(newMockJavaLibraryModule))
ctx.RegisterModuleType("java_device_for_host", ModuleFactoryAdaptor(newMockJavaLibraryModule))
ctx.PostDepsMutators(registerNeverallowMutator)
ctx.Register()
diff --git a/java/sdk_test.go b/java/sdk_test.go
index 142d6f5..23d7a98 100644
--- a/java/sdk_test.go
+++ b/java/sdk_test.go
@@ -137,13 +137,6 @@
classpath: []string{},
},
{
- name: "host nostdlib",
- moduleType: "java_library_host",
- host: android.Host,
- properties: `no_standard_libs: true`,
- classpath: []string{},
- },
- {
name: "host supported default",
host: android.Host,