Merge "Remove Turbine definition from config.mk" am: a6d7420c58

am: 117151358c

Change-Id: Ib9c70d293af3d6ca6cd7207cd0b4960202066f4c
This commit is contained in:
Nan Zhang 2017-10-21 01:32:52 +00:00 committed by android-build-merger
commit 678aa00ba7

View file

@ -631,7 +631,6 @@ DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar
FAT16COPY := build/tools/fat16copy.py
CHECK_LINK_TYPE := build/tools/check_link_type.py
TURBINE := $(HOST_OUT_JAVA_LIBRARIES)/turbine$(COMMON_JAVA_PACKAGE_SUFFIX)
PROGUARD := external/proguard/bin/proguard.sh
JAVATAGS := build/tools/java-event-log-tags.py
MERGETAGS := build/tools/merge-event-log-tags.py