aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-06-15 23:15:14 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-06-15 23:15:14 +0000
commit2f15f1f3c8e2e6fd9d919518d34ba62299395fc4 (patch)
treec2e02bf88367b9bc74a322610adc88f7bd69ba7f
parent8b789e66ef5b0c86662f821de5a1b9704102a436 (diff)
parent6df90831b7825bcb3dc233dbc5b1e47e4316d990 (diff)
downloadbuild_soong-2f15f1f3c8e2e6fd9d919518d34ba62299395fc4.tar.gz
build_soong-2f15f1f3c8e2e6fd9d919518d34ba62299395fc4.tar.bz2
build_soong-2f15f1f3c8e2e6fd9d919518d34ba62299395fc4.zip
Snap for 5663820 from 6df90831b7825bcb3dc233dbc5b1e47e4316d990 to qt-release
Change-Id: I4dbcf271935f0d33b068e45ab2f4bbc93ec20fa6
-rw-r--r--android/neverallow.go2
-rw-r--r--android/neverallow_test.go15
2 files changed, 1 insertions, 16 deletions
diff --git a/android/neverallow.go b/android/neverallow.go
index 1983f0ea..b90fe43d 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -71,7 +71,7 @@ func createTrebleRules() []*rule {
// TODO(b/67974785): always enforce the manifest
neverallow().
- without("name", "libhidltransport").
+ without("name", "libhidltransport-impl-internal").
with("product_variables.enforce_vintf_manifest.cflags", "*").
because("manifest enforcement should be independent of ."),
diff --git a/android/neverallow_test.go b/android/neverallow_test.go
index 5451620f..6fd2cd71 100644
--- a/android/neverallow_test.go
+++ b/android/neverallow_test.go
@@ -91,21 +91,6 @@ var neverallowTests = []struct {
},
expectedError: "manifest enforcement should be independent",
},
- {
- name: "libhidltransport enforce_vintf_manifest.cflags",
- fs: map[string][]byte{
- "Blueprints": []byte(`
- cc_library {
- name: "libhidltransport",
- product_variables: {
- enforce_vintf_manifest: {
- cflags: ["-DSHOULD_NOT_EXIST"],
- },
- },
- }`),
- },
- expectedError: "",
- },
{
name: "no treble_linker_namespaces.cflags",