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

Commit e21d7ae8 authored Jan 25, 2015 by Elliott Hughes Committed by Gerrit Code Review Jan 25, 2015

Merge "Remove obsolete BUILD_TINY_ANDROID."

parents ae79cb5a 110dd4b2

libpixelflinger/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -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.

netcfg/Android.mk

+1 −10

Original line number	Diff line number	Diff line
		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