commit be1badc30a1a0ab367fdf70678a3b9a4a6c64439
author Steven Moreland <smoreland@google.com> Thu Nov 17 14:57:37 2016 -0800
committer Ruchi Kandoi <kandoiruchi@google.com> Thu Jan 12 11:02:22 2017 -0800
tree 779a73ea431e5da5dde22a2e425ee494e642c41a
parent 1ee9859640727c3df1366d6177b6ac5ba41ff0c4

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
(cherry picked from commit 2b2cef28646d013e3c99ed404f877e998476b94a)

nfc/1.0/vts/Android.mk

diff --git a/nfc/1.0/vts/Android.mk b/nfc/1.0/vts/Android.mk
index 67adc7f..04884b7 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 \
@@ -46,10 +41,6 @@
   libvts_measurement \
   libvts_multidevice_proto \
 
-LOCAL_CFLAGS += -DENABLE_TREBLE
-
-LOCAL_STATIC_LIBRARIES := \
-
 LOCAL_PROTOC_OPTIMIZE_TYPE := full
 
 LOCAL_MULTILIB := both