From 110dd4b24bc9f3bbd4e15ab25be73d70cdfa44fb Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 24 Jan 2015 22:39:10 -0800 Subject: [PATCH] Remove obsolete BUILD_TINY_ANDROID. Change-Id: I876bce99efb40cd791256535d8d6c0d046b7aeae --- libpixelflinger/Android.mk | 2 -- netcfg/Android.mk | 11 +---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index f1bd522cc..acd18b026 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -64,12 +64,10 @@ LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips) LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) LOCAL_SHARED_LIBRARIES := libcutils liblog -ifneq ($(BUILD_TINY_ANDROID),true) # Really this should go away entirely or at least not depend on # libhardware, but this at least gets us built. LOCAL_SHARED_LIBRARIES += libhardware_legacy LOCAL_CFLAGS += -DWITH_LIB_HARDWARE -endif # t32cb16blend.S does not compile with Clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as # arch-arm64/col32cb16blend.S does not compile with Clang. diff --git a/netcfg/Android.mk b/netcfg/Android.mk index fc01a5464..4796c119d 100644 --- a/netcfg/Android.mk +++ b/netcfg/Android.mk @@ -1,17 +1,8 @@ -ifneq ($(BUILD_TINY_ANDROID),true) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= netcfg.c LOCAL_MODULE:= netcfg - -#LOCAL_FORCE_STATIC_EXECUTABLE := true -#LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN) -#LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED) -#LOCAL_STATIC_LIBRARIES := libcutils libc - -LOCAL_SHARED_LIBRARIES := libc libnetutils +LOCAL_SHARED_LIBRARIES := libnetutils LOCAL_CFLAGS := -Werror - include $(BUILD_EXECUTABLE) -endif