aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2019-06-14 16:17:21 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-14 16:17:21 -0700
commitd9c5deb3a7f898c97b9f4a7f6a2d8fd28fc76f97 (patch)
tree301e89e125a48d1b5817d61972f1621f6ff5559d
parenta625ce4dc87a80874852ca8c374489afb9ccb8b5 (diff)
parent6df90831b7825bcb3dc233dbc5b1e47e4316d990 (diff)
downloadbuild_soong-d9c5deb3a7f898c97b9f4a7f6a2d8fd28fc76f97.tar.gz
build_soong-d9c5deb3a7f898c97b9f4a7f6a2d8fd28fc76f97.tar.bz2
build_soong-d9c5deb3a7f898c97b9f4a7f6a2d8fd28fc76f97.zip
Merge "neverallow: vintf to libhidltransport impl lib" into qt-dev
am: 6df90831b7 Change-Id: Ib709b3ccc7adede11bc7d632897b488533fd4f7e
-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",