diff options
-rw-r--r-- | boot/1.0/vts/Android.mk | 9 | ||||
-rw-r--r-- | light/2.0/vts/Android.mk | 2 | ||||
-rw-r--r-- | memtrack/1.0/vts/Android.mk | 9 | ||||
-rw-r--r-- | nfc/1.0/vts/Android.mk | 9 | ||||
-rw-r--r-- | power/1.0/vts/Android.mk | 9 | ||||
-rw-r--r-- | vibrator/1.0/vts/Android.mk | 9 | ||||
-rw-r--r-- | vr/1.0/vts/Android.mk | 9 |
7 files changed, 0 insertions, 56 deletions
diff --git a/boot/1.0/vts/Android.mk b/boot/1.0/vts/Android.mk index 16b92c15..5604ca8c 100644 --- a/boot/1.0/vts/Android.mk +++ b/boot/1.0/vts/Android.mk | |||
@@ -25,11 +25,6 @@ LOCAL_SRC_FILES := \ | |||
25 | BootControl.vts \ | 25 | BootControl.vts \ |
26 | types.vts \ | 26 | types.vts \ |
27 | 27 | ||
28 | LOCAL_C_INCLUDES := \ | ||
29 | android.hardware.boot@1.0\ | ||
30 | system/core/base/include \ | ||
31 | system/core/include \ | ||
32 | |||
33 | LOCAL_SHARED_LIBRARIES += \ | 28 | LOCAL_SHARED_LIBRARIES += \ |
34 | android.hardware.boot@1.0 \ | 29 | android.hardware.boot@1.0 \ |
35 | libbase \ | 30 | libbase \ |
@@ -44,10 +39,6 @@ LOCAL_SHARED_LIBRARIES += \ | |||
44 | libvts_measurement \ | 39 | libvts_measurement \ |
45 | libvts_multidevice_proto \ | 40 | libvts_multidevice_proto \ |
46 | 41 | ||
47 | LOCAL_CFLAGS += -DENABLE_TREBLE | ||
48 | |||
49 | LOCAL_STATIC_LIBRARIES := \ | ||
50 | |||
51 | LOCAL_PROTOC_OPTIMIZE_TYPE := full | 42 | LOCAL_PROTOC_OPTIMIZE_TYPE := full |
52 | 43 | ||
53 | LOCAL_MULTILIB := both | 44 | LOCAL_MULTILIB := both |
diff --git a/light/2.0/vts/Android.mk b/light/2.0/vts/Android.mk index a8c8c20b..c80e6977 100644 --- a/light/2.0/vts/Android.mk +++ b/light/2.0/vts/Android.mk | |||
@@ -39,8 +39,6 @@ LOCAL_SHARED_LIBRARIES += \ | |||
39 | libvts_measurement \ | 39 | libvts_measurement \ |
40 | libvts_multidevice_proto | 40 | libvts_multidevice_proto |
41 | 41 | ||
42 | LOCAL_CFLAGS += -DENABLE_TREBLE | ||
43 | |||
44 | LOCAL_PROTOC_OPTIMIZE_TYPE := full | 42 | LOCAL_PROTOC_OPTIMIZE_TYPE := full |
45 | 43 | ||
46 | LOCAL_MULTILIB := both | 44 | LOCAL_MULTILIB := both |
diff --git a/memtrack/1.0/vts/Android.mk b/memtrack/1.0/vts/Android.mk index c0fe968c..9b58e13a 100644 --- a/memtrack/1.0/vts/Android.mk +++ b/memtrack/1.0/vts/Android.mk | |||
@@ -25,11 +25,6 @@ LOCAL_SRC_FILES := \ | |||
25 | Memtrack.vts \ | 25 | Memtrack.vts \ |
26 | types.vts \ | 26 | types.vts \ |
27 | 27 | ||
28 | LOCAL_C_INCLUDES := \ | ||
29 | android.hardware.memtrack@1.0 \ | ||
30 | system/core/base/include \ | ||
31 | system/core/include \ | ||
32 | |||
33 | LOCAL_SHARED_LIBRARIES += \ | 28 | LOCAL_SHARED_LIBRARIES += \ |
34 | android.hardware.memtrack@1.0 \ | 29 | android.hardware.memtrack@1.0 \ |
35 | libbase \ | 30 | libbase \ |
@@ -44,10 +39,6 @@ LOCAL_SHARED_LIBRARIES += \ | |||
44 | libvts_measurement \ | 39 | libvts_measurement \ |
45 | libvts_multidevice_proto \ | 40 | libvts_multidevice_proto \ |
46 | 41 | ||
47 | LOCAL_CFLAGS += -DENABLE_TREBLE | ||
48 | |||
49 | LOCAL_STATIC_LIBRARIES := \ | ||
50 | |||
51 | LOCAL_PROTOC_OPTIMIZE_TYPE := full | 42 | LOCAL_PROTOC_OPTIMIZE_TYPE := full |
52 | 43 | ||
53 | LOCAL_MULTILIB := both | 44 | LOCAL_MULTILIB := both |
diff --git a/nfc/1.0/vts/Android.mk b/nfc/1.0/vts/Android.mk index 6f63e03e..0db7107d 100644 --- a/nfc/1.0/vts/Android.mk +++ b/nfc/1.0/vts/Android.mk | |||
@@ -26,11 +26,6 @@ LOCAL_SRC_FILES := \ | |||
26 | NfcClientCallback.vts \ | 26 | NfcClientCallback.vts \ |
27 | types.vts \ | 27 | types.vts \ |
28 | 28 | ||
29 | LOCAL_C_INCLUDES := \ | ||
30 | android.hardware.nfc@1.0 \ | ||
31 | system/core/base/include \ | ||
32 | system/core/include \ | ||
33 | |||
34 | LOCAL_SHARED_LIBRARIES += \ | 29 | LOCAL_SHARED_LIBRARIES += \ |
35 | android.hardware.nfc@1.0 \ | 30 | android.hardware.nfc@1.0 \ |
36 | libbase \ | 31 | libbase \ |
@@ -45,10 +40,6 @@ LOCAL_SHARED_LIBRARIES += \ | |||
45 | libvts_measurement \ | 40 | libvts_measurement \ |
46 | libvts_multidevice_proto \ | 41 | libvts_multidevice_proto \ |
47 | 42 | ||
48 | LOCAL_CFLAGS += -DENABLE_TREBLE | ||
49 | |||
50 | LOCAL_STATIC_LIBRARIES := \ | ||
51 | |||
52 | LOCAL_PROTOC_OPTIMIZE_TYPE := full | 43 | LOCAL_PROTOC_OPTIMIZE_TYPE := full |
53 | 44 | ||
54 | LOCAL_MULTILIB := both | 45 | LOCAL_MULTILIB := both |
diff --git a/power/1.0/vts/Android.mk b/power/1.0/vts/Android.mk index 4d5117b2..0dcc9826 100644 --- a/power/1.0/vts/Android.mk +++ b/power/1.0/vts/Android.mk | |||
@@ -25,11 +25,6 @@ LOCAL_SRC_FILES := \ | |||
25 | Power.vts \ | 25 | Power.vts \ |
26 | types.vts \ | 26 | types.vts \ |
27 | 27 | ||
28 | LOCAL_C_INCLUDES := \ | ||
29 | android.hardware.power@1.0 \ | ||
30 | system/core/base/include \ | ||
31 | system/core/include \ | ||
32 | |||
33 | LOCAL_SHARED_LIBRARIES += \ | 28 | LOCAL_SHARED_LIBRARIES += \ |
34 | android.hardware.power@1.0 \ | 29 | android.hardware.power@1.0 \ |
35 | libbase \ | 30 | libbase \ |
@@ -44,10 +39,6 @@ LOCAL_SHARED_LIBRARIES += \ | |||
44 | libvts_measurement \ | 39 | libvts_measurement \ |
45 | libvts_multidevice_proto \ | 40 | libvts_multidevice_proto \ |
46 | 41 | ||
47 | LOCAL_CFLAGS += -DENABLE_TREBLE | ||
48 | |||
49 | LOCAL_STATIC_LIBRARIES := \ | ||
50 | |||
51 | LOCAL_PROTOC_OPTIMIZE_TYPE := full | 42 | LOCAL_PROTOC_OPTIMIZE_TYPE := full |
52 | 43 | ||
53 | LOCAL_MULTILIB := both | 44 | LOCAL_MULTILIB := both |
diff --git a/vibrator/1.0/vts/Android.mk b/vibrator/1.0/vts/Android.mk index bdecb85a..750c9298 100644 --- a/vibrator/1.0/vts/Android.mk +++ b/vibrator/1.0/vts/Android.mk | |||
@@ -25,11 +25,6 @@ LOCAL_SRC_FILES := \ | |||
25 | Vibrator.vts \ | 25 | Vibrator.vts \ |
26 | types.vts \ | 26 | types.vts \ |
27 | 27 | ||
28 | LOCAL_C_INCLUDES := \ | ||
29 | android.hardware.vibrator@1.0 \ | ||
30 | system/core/base/include \ | ||
31 | system/core/include \ | ||
32 | |||
33 | LOCAL_SHARED_LIBRARIES += \ | 28 | LOCAL_SHARED_LIBRARIES += \ |
34 | android.hardware.vibrator@1.0 \ | 29 | android.hardware.vibrator@1.0 \ |
35 | libbase \ | 30 | libbase \ |
@@ -44,10 +39,6 @@ LOCAL_SHARED_LIBRARIES += \ | |||
44 | libvts_measurement \ | 39 | libvts_measurement \ |
45 | libvts_multidevice_proto \ | 40 | libvts_multidevice_proto \ |
46 | 41 | ||
47 | LOCAL_CFLAGS += -DENABLE_TREBLE | ||
48 | |||
49 | LOCAL_STATIC_LIBRARIES := \ | ||
50 | |||
51 | LOCAL_PROTOC_OPTIMIZE_TYPE := full | 42 | LOCAL_PROTOC_OPTIMIZE_TYPE := full |
52 | 43 | ||
53 | LOCAL_MULTILIB := both | 44 | LOCAL_MULTILIB := both |
diff --git a/vr/1.0/vts/Android.mk b/vr/1.0/vts/Android.mk index 3c456524..93f85461 100644 --- a/vr/1.0/vts/Android.mk +++ b/vr/1.0/vts/Android.mk | |||
@@ -24,11 +24,6 @@ LOCAL_MODULE := libvts_driver_hidl_vr@1.0 | |||
24 | LOCAL_SRC_FILES := \ | 24 | LOCAL_SRC_FILES := \ |
25 | Vr.vts \ | 25 | Vr.vts \ |
26 | 26 | ||
27 | LOCAL_C_INCLUDES := \ | ||
28 | android.hardware.vr@1.0 \ | ||
29 | system/core/base/include \ | ||
30 | system/core/include \ | ||
31 | |||
32 | LOCAL_SHARED_LIBRARIES += \ | 27 | LOCAL_SHARED_LIBRARIES += \ |
33 | android.hardware.vr@1.0 \ | 28 | android.hardware.vr@1.0 \ |
34 | libbase \ | 29 | libbase \ |
@@ -43,10 +38,6 @@ LOCAL_SHARED_LIBRARIES += \ | |||
43 | libvts_measurement \ | 38 | libvts_measurement \ |
44 | libvts_multidevice_proto \ | 39 | libvts_multidevice_proto \ |
45 | 40 | ||
46 | LOCAL_CFLAGS += -DENABLE_TREBLE | ||
47 | |||
48 | LOCAL_STATIC_LIBRARIES := \ | ||
49 | |||
50 | LOCAL_PROTOC_OPTIMIZE_TYPE := full | 41 | LOCAL_PROTOC_OPTIMIZE_TYPE := full |
51 | 42 | ||
52 | LOCAL_MULTILIB := both | 43 | LOCAL_MULTILIB := both |