Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17452436 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS."

parents 6c31eaf8 2b2cef28

boot/1.0/vts/Android.mk

+0 −9
Original line number Original line Diff line number Diff line
@@ -25,11 +25,6 @@ LOCAL_SRC_FILES := \ 
  BootControl.vts \

  BootControl.vts \

  types.vts \

  types.vts \





LOCAL_C_INCLUDES := \

  android.hardware.boot@1.0\

  system/core/base/include \

  system/core/include \



LOCAL_SHARED_LIBRARIES += \

LOCAL_SHARED_LIBRARIES += \

  android.hardware.boot@1.0 \

  android.hardware.boot@1.0 \

  libbase \

  libbase \
@@ -45,10 +40,6 @@ LOCAL_SHARED_LIBRARIES += \ 
  libvts_measurement \

  libvts_measurement \

  libvts_multidevice_proto \

  libvts_multidevice_proto \





LOCAL_CFLAGS += -DENABLE_TREBLE



LOCAL_STATIC_LIBRARIES := \



LOCAL_PROTOC_OPTIMIZE_TYPE := full

LOCAL_PROTOC_OPTIMIZE_TYPE := full





LOCAL_MULTILIB := both

LOCAL_MULTILIB := both

light/2.0/vts/Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -40,8 +40,6 @@ LOCAL_SHARED_LIBRARIES += \ 
    libvts_measurement \

    libvts_measurement \

    libvts_multidevice_proto

    libvts_multidevice_proto





LOCAL_CFLAGS += -DENABLE_TREBLE



LOCAL_PROTOC_OPTIMIZE_TYPE := full

LOCAL_PROTOC_OPTIMIZE_TYPE := full





LOCAL_MULTILIB := both

LOCAL_MULTILIB := both

memtrack/1.0/vts/Android.mk

+0 −9
Original line number Original line Diff line number Diff line
@@ -25,11 +25,6 @@ LOCAL_SRC_FILES := \ 
  Memtrack.vts \

  Memtrack.vts \

  types.vts \

  types.vts \





LOCAL_C_INCLUDES := \

  android.hardware.memtrack@1.0 \

  system/core/base/include \

  system/core/include \



LOCAL_SHARED_LIBRARIES += \

LOCAL_SHARED_LIBRARIES += \

  android.hardware.memtrack@1.0 \

  android.hardware.memtrack@1.0 \

  libbase \

  libbase \
@@ -45,10 +40,6 @@ LOCAL_SHARED_LIBRARIES += \ 
  libvts_measurement \

  libvts_measurement \

  libvts_multidevice_proto \

  libvts_multidevice_proto \





LOCAL_CFLAGS += -DENABLE_TREBLE



LOCAL_STATIC_LIBRARIES := \



LOCAL_PROTOC_OPTIMIZE_TYPE := full

LOCAL_PROTOC_OPTIMIZE_TYPE := full





LOCAL_MULTILIB := both

LOCAL_MULTILIB := both

nfc/1.0/vts/Android.mk

+0 −9
Original line number Original line Diff line number Diff line
@@ -26,11 +26,6 @@ LOCAL_SRC_FILES := \ 
  NfcClientCallback.vts \

  NfcClientCallback.vts \

  types.vts \

  types.vts \





LOCAL_C_INCLUDES := \

  android.hardware.nfc@1.0 \

  system/core/base/include \

  system/core/include \



LOCAL_SHARED_LIBRARIES += \

LOCAL_SHARED_LIBRARIES += \

  android.hardware.nfc@1.0 \

  android.hardware.nfc@1.0 \

  libbase \

  libbase \
@@ -46,10 +41,6 @@ LOCAL_SHARED_LIBRARIES += \ 
  libvts_measurement \

  libvts_measurement \

  libvts_multidevice_proto \

  libvts_multidevice_proto \





LOCAL_CFLAGS += -DENABLE_TREBLE



LOCAL_STATIC_LIBRARIES := \



LOCAL_PROTOC_OPTIMIZE_TYPE := full

LOCAL_PROTOC_OPTIMIZE_TYPE := full





LOCAL_MULTILIB := both

LOCAL_MULTILIB := both

power/1.0/vts/Android.mk

+0 −9
Original line number Original line Diff line number Diff line
@@ -25,11 +25,6 @@ LOCAL_SRC_FILES := \ 
  Power.vts \

  Power.vts \

  types.vts \

  types.vts \





LOCAL_C_INCLUDES := \

  android.hardware.power@1.0 \

  system/core/base/include \

  system/core/include \



LOCAL_SHARED_LIBRARIES += \

LOCAL_SHARED_LIBRARIES += \

  android.hardware.power@1.0 \

  android.hardware.power@1.0 \

  libbase \

  libbase \
@@ -45,10 +40,6 @@ LOCAL_SHARED_LIBRARIES += \ 
  libvts_measurement \

  libvts_measurement \

  libvts_multidevice_proto \

  libvts_multidevice_proto \





LOCAL_CFLAGS += -DENABLE_TREBLE



LOCAL_STATIC_LIBRARIES := \



LOCAL_PROTOC_OPTIMIZE_TYPE := full

LOCAL_PROTOC_OPTIMIZE_TYPE := full





LOCAL_MULTILIB := both

LOCAL_MULTILIB := both