commit 757394b65e8450b4be793c9dc1aace550e7735b0
author Steven Moreland <smoreland@google.com> Wed Dec 13 14:09:24 2017 -0800
committer Steven Moreland <smoreland@google.com> Wed Dec 13 22:21:44 2017 +0000
tree 48d12fabae68ce544acc6145630bb0ff29df4179
parent 1f04810bf3bf8e37266b1eae0a27a0e54921556a

Use enforce_vintf_manifest instead of treble.

More specific.

Bug: 62019611
Test: manual
Change-Id: I8e5296bbad00b1f26b9dc27682e6e5212641214b

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 357faaf..ef86f99 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -639,22 +639,22 @@
     const bool vintfHwbinder = (transport == Transport::HWBINDER);
     const bool vintfPassthru = (transport == Transport::PASSTHROUGH);
 
-#ifdef LIBHIDL_TARGET_TREBLE
+#ifdef ENFORCE_VINTF_MANIFEST
 
 #ifdef LIBHIDL_TARGET_DEBUGGABLE
     const char* env = std::getenv("TREBLE_TESTING_OVERRIDE");
     const bool trebleTestingOverride = env && !strcmp(env, "true");
     const bool vintfLegacy = (transport == Transport::EMPTY) && trebleTestingOverride;
-#else   // LIBHIDL_TARGET_TREBLE but not LIBHIDL_TARGET_DEBUGGABLE
+#else   // ENFORCE_VINTF_MANIFEST but not LIBHIDL_TARGET_DEBUGGABLE
     const bool trebleTestingOverride = false;
     const bool vintfLegacy = false;
 #endif  // LIBHIDL_TARGET_DEBUGGABLE
 
-#else   // not LIBHIDL_TARGET_TREBLE
+#else   // not ENFORCE_VINTF_MANIFEST
     const char* env = std::getenv("TREBLE_TESTING_OVERRIDE");
     const bool trebleTestingOverride = env && !strcmp(env, "true");
     const bool vintfLegacy = (transport == Transport::EMPTY);
-#endif  // LIBHIDL_TARGET_TREBLE
+#endif  // ENFORCE_VINTF_MANIFEST
 
     sp<Waiter> waiter = new Waiter(descriptor, instance, sm);
     while (!getStub && (vintfHwbinder || vintfLegacy)) {