Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS.
I went ahead and removed some no-ops from the mk's.
Bug: 32978887
Test: mma -j64
Change-Id: I6f8341332aa9f249912f6a8b3a3664b76d362e99
diff --git a/boot/1.0/vts/Android.mk b/boot/1.0/vts/Android.mk
index 16b92c1..5604ca8 100644
--- a/boot/1.0/vts/Android.mk
+++ b/boot/1.0/vts/Android.mk
@@ -25,11 +25,6 @@
BootControl.vts \
types.vts \
-LOCAL_C_INCLUDES := \
- android.hardware.boot@1.0\
- system/core/base/include \
- system/core/include \
-
LOCAL_SHARED_LIBRARIES += \
android.hardware.boot@1.0 \
libbase \
@@ -44,10 +39,6 @@
libvts_measurement \
libvts_multidevice_proto \
-LOCAL_CFLAGS += -DENABLE_TREBLE
-
-LOCAL_STATIC_LIBRARIES := \
-
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_MULTILIB := both
diff --git a/light/2.0/vts/Android.mk b/light/2.0/vts/Android.mk
index a8c8c20..c80e697 100644
--- a/light/2.0/vts/Android.mk
+++ b/light/2.0/vts/Android.mk
@@ -39,8 +39,6 @@
libvts_measurement \
libvts_multidevice_proto
-LOCAL_CFLAGS += -DENABLE_TREBLE
-
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_MULTILIB := both
diff --git a/memtrack/1.0/vts/Android.mk b/memtrack/1.0/vts/Android.mk
index c0fe968..9b58e13 100644
--- a/memtrack/1.0/vts/Android.mk
+++ b/memtrack/1.0/vts/Android.mk
@@ -25,11 +25,6 @@
Memtrack.vts \
types.vts \
-LOCAL_C_INCLUDES := \
- android.hardware.memtrack@1.0 \
- system/core/base/include \
- system/core/include \
-
LOCAL_SHARED_LIBRARIES += \
android.hardware.memtrack@1.0 \
libbase \
@@ -44,10 +39,6 @@
libvts_measurement \
libvts_multidevice_proto \
-LOCAL_CFLAGS += -DENABLE_TREBLE
-
-LOCAL_STATIC_LIBRARIES := \
-
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_MULTILIB := both
diff --git a/nfc/1.0/vts/Android.mk b/nfc/1.0/vts/Android.mk
index 6f63e03..0db7107 100644
--- a/nfc/1.0/vts/Android.mk
+++ b/nfc/1.0/vts/Android.mk
@@ -26,11 +26,6 @@
NfcClientCallback.vts \
types.vts \
-LOCAL_C_INCLUDES := \
- android.hardware.nfc@1.0 \
- system/core/base/include \
- system/core/include \
-
LOCAL_SHARED_LIBRARIES += \
android.hardware.nfc@1.0 \
libbase \
@@ -45,10 +40,6 @@
libvts_measurement \
libvts_multidevice_proto \
-LOCAL_CFLAGS += -DENABLE_TREBLE
-
-LOCAL_STATIC_LIBRARIES := \
-
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_MULTILIB := both
diff --git a/power/1.0/vts/Android.mk b/power/1.0/vts/Android.mk
index 4d5117b..0dcc982 100644
--- a/power/1.0/vts/Android.mk
+++ b/power/1.0/vts/Android.mk
@@ -25,11 +25,6 @@
Power.vts \
types.vts \
-LOCAL_C_INCLUDES := \
- android.hardware.power@1.0 \
- system/core/base/include \
- system/core/include \
-
LOCAL_SHARED_LIBRARIES += \
android.hardware.power@1.0 \
libbase \
@@ -44,10 +39,6 @@
libvts_measurement \
libvts_multidevice_proto \
-LOCAL_CFLAGS += -DENABLE_TREBLE
-
-LOCAL_STATIC_LIBRARIES := \
-
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_MULTILIB := both
diff --git a/vibrator/1.0/vts/Android.mk b/vibrator/1.0/vts/Android.mk
index bdecb85..750c929 100644
--- a/vibrator/1.0/vts/Android.mk
+++ b/vibrator/1.0/vts/Android.mk
@@ -25,11 +25,6 @@
Vibrator.vts \
types.vts \
-LOCAL_C_INCLUDES := \
- android.hardware.vibrator@1.0 \
- system/core/base/include \
- system/core/include \
-
LOCAL_SHARED_LIBRARIES += \
android.hardware.vibrator@1.0 \
libbase \
@@ -44,10 +39,6 @@
libvts_measurement \
libvts_multidevice_proto \
-LOCAL_CFLAGS += -DENABLE_TREBLE
-
-LOCAL_STATIC_LIBRARIES := \
-
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_MULTILIB := both
diff --git a/vr/1.0/vts/Android.mk b/vr/1.0/vts/Android.mk
index 3c45652..93f8546 100644
--- a/vr/1.0/vts/Android.mk
+++ b/vr/1.0/vts/Android.mk
@@ -24,11 +24,6 @@
LOCAL_SRC_FILES := \
Vr.vts \
-LOCAL_C_INCLUDES := \
- android.hardware.vr@1.0 \
- system/core/base/include \
- system/core/include \
-
LOCAL_SHARED_LIBRARIES += \
android.hardware.vr@1.0 \
libbase \
@@ -43,10 +38,6 @@
libvts_measurement \
libvts_multidevice_proto \
-LOCAL_CFLAGS += -DENABLE_TREBLE
-
-LOCAL_STATIC_LIBRARIES := \
-
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_MULTILIB := both