From c0481af40604b8a83ff2ddfbc04b37045c7fa228 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 18 May 2012 20:03:43 -0700 Subject: host modules don't need LOCAL_MODULE_TAGS Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137 --- applypatch/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 0e529d4..ef57f24 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -50,7 +50,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := imgdiff.c utils.c bsdiff.c LOCAL_MODULE := imgdiff LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES += external/zlib external/bzip2 LOCAL_STATIC_LIBRARIES += libz libbz -- cgit v1.1 From 6396e70d3fd381f6e3ccaff84c5a05bc5e3cec3c Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Thu, 31 May 2012 23:21:46 -0700 Subject: Multiple modules with the same name are going away. Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e --- Android.mk | 94 ++++++++++++++++++++++++++++++++++-------------------- updater/Android.mk | 5 ++- 2 files changed, 63 insertions(+), 36 deletions(-) diff --git a/Android.mk b/Android.mk index 751ed72..5811c47 100644 --- a/Android.mk +++ b/Android.mk @@ -1,7 +1,21 @@ +# Copyright (C) 2007 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -commands_recovery_local_path := $(LOCAL_PATH) + +include $(CLEAR_VARS) LOCAL_SRC_FILES := \ recovery.cpp \ @@ -20,25 +34,37 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true RECOVERY_API_VERSION := 3 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) -LOCAL_STATIC_LIBRARIES := +LOCAL_STATIC_LIBRARIES := \ + libext4_utils_static \ + libsparse \ + libminzip \ + libz \ + libmtdutils \ + libmincrypt \ + libminadbd \ + libminui \ + libpixelflinger_static \ + libpng \ + libcutils \ + libstdc++ \ + libc ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) -LOCAL_CFLAGS += -DUSE_EXT4 -LOCAL_C_INCLUDES += system/extras/ext4_utils -LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz + LOCAL_CFLAGS += -DUSE_EXT4 + LOCAL_C_INCLUDES += system/extras/ext4_utils + LOCAL_STATIC_LIBRARIES += libext4_utils_static libz endif ifeq ($(HAVE_SELINUX), true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_STATIC_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_STATIC_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX # This binary is in the recovery ramdisk, which is otherwise a copy of root. # It gets copied there in config/Makefile. LOCAL_MODULE_TAGS suppresses # a (redundant) copy of the binary in /system/bin for user builds. # TODO: Build the ramdisk image in a more principled way. - LOCAL_MODULE_TAGS := eng ifeq ($(TARGET_RECOVERY_UI_LIB),) @@ -46,15 +72,11 @@ ifeq ($(TARGET_RECOVERY_UI_LIB),) else LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB) endif -LOCAL_STATIC_LIBRARIES += libext4_utils libsparse -LOCAL_STATIC_LIBRARIES += libminzip libz libmtdutils libmincrypt libminadbd -LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils -LOCAL_STATIC_LIBRARIES += libstdc++ libc ifeq ($(HAVE_SELINUX),true) -LOCAL_C_INCLUDES += external/libselinux/include -LOCAL_STATIC_LIBRARIES += libselinux -LOCAL_CFLAGS += -DHAVE_SELINUX + LOCAL_C_INCLUDES += external/libselinux/include + LOCAL_STATIC_LIBRARIES += libselinux + LOCAL_CFLAGS += -DHAVE_SELINUX endif # HAVE_SELINUX LOCAL_C_INCLUDES += system/extras/ext4_utils @@ -62,28 +84,30 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := verifier_test.cpp verifier.cpp ui.cpp +include $(CLEAR_VARS) LOCAL_MODULE := verifier_test - LOCAL_FORCE_STATIC_EXECUTABLE := true - LOCAL_MODULE_TAGS := tests - -LOCAL_STATIC_LIBRARIES := libmincrypt libminui libcutils libstdc++ libc - +LOCAL_SRC_FILES := \ + verifier_test.cpp \ + verifier.cpp \ + ui.cpp +LOCAL_STATIC_LIBRARIES := \ + libmincrypt \ + libminui \ + libcutils \ + libstdc++ \ + libc include $(BUILD_EXECUTABLE) -include $(commands_recovery_local_path)/minui/Android.mk -include $(commands_recovery_local_path)/minelf/Android.mk -include $(commands_recovery_local_path)/minzip/Android.mk -include $(commands_recovery_local_path)/minadbd/Android.mk -include $(commands_recovery_local_path)/mtdutils/Android.mk -include $(commands_recovery_local_path)/tools/Android.mk -include $(commands_recovery_local_path)/edify/Android.mk -include $(commands_recovery_local_path)/updater/Android.mk -include $(commands_recovery_local_path)/applypatch/Android.mk -commands_recovery_local_path := +include $(LOCAL_PATH)/minui/Android.mk \ + $(LOCAL_PATH)/minelf/Android.mk \ + $(LOCAL_PATH)/minzip/Android.mk \ + $(LOCAL_PATH)/minadbd/Android.mk \ + $(LOCAL_PATH)/mtdutils/Android.mk \ + $(LOCAL_PATH)/tools/Android.mk \ + $(LOCAL_PATH)/edify/Android.mk \ + $(LOCAL_PATH)/updater/Android.mk \ + $(LOCAL_PATH)/applypatch/Android.mk diff --git a/updater/Android.mk b/updater/Android.mk index fcaf6d5..38bb1ae 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -21,7 +21,10 @@ LOCAL_SRC_FILES := $(updater_src_files) ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_C_INCLUDES += system/extras/ext4_utils -LOCAL_STATIC_LIBRARIES += libext4_utils libsparse libz +LOCAL_STATIC_LIBRARIES += \ + libext4_utils_static \ + libsparse \ + libz endif ifeq ($(HAVE_SELINUX), true) -- cgit v1.1 From 4eeb379886f9ee3d832a38805ceaf15e0e08d685 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Mon, 23 Jul 2012 19:14:30 -0700 Subject: Use the static version of libsparse Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2 --- Android.mk | 2 +- updater/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 5811c47..1c78b42 100644 --- a/Android.mk +++ b/Android.mk @@ -36,7 +36,7 @@ LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) LOCAL_STATIC_LIBRARIES := \ libext4_utils_static \ - libsparse \ + libsparse_static \ libminzip \ libz \ libmtdutils \ diff --git a/updater/Android.mk b/updater/Android.mk index 38bb1ae..8876120 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -23,7 +23,7 @@ LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += \ libext4_utils_static \ - libsparse \ + libsparse_static \ libz endif -- cgit v1.1