From 75e326486763e9b0a764a837cae38719b79cb329 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Wed, 24 Feb 2010 15:57:23 -0800 Subject: [PATCH 1/5] Don't build OTA package for aosp_emulator_us This allows "make dist" to work on that configuration. A better fix would be to allow each product to specify whether it's an emulator target or a device target, and to adapt to that, but that'd be a lot more intrusive. Change-Id: I47708025204a4991466abceb1708a3020a543238 --- core/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/Makefile b/core/Makefile index 2f316ca11..46f53117d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -907,6 +907,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE) ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_PRODUCT),sdk) ifneq ($(TARGET_PRODUCT),generic) +ifneq ($(TARGET_PRODUCT),aosp_emulator_us) name := $(TARGET_PRODUCT) ifeq ($(TARGET_BUILD_TYPE),debug) @@ -936,6 +937,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools .PHONY: otapackage otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) +endif # TARGET_PRODUCT != aosp_emulator_us endif # TARGET_PRODUCT != generic endif # TARGET_PRODUCT != sdk endif # TARGET_SIMULATOR != true From 4eb079f67f7ec1dea9c430edfe6a2a589b3100d9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 22 Jan 2010 13:25:24 -0800 Subject: [PATCH 2/5] Look for product configs in device/ in addition to vendor/ This will allow to create open-sourceable product configurations. Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c --- core/config.mk | 1 + core/product.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/config.mk b/core/config.mk index e574124b1..4662a3809 100644 --- a/core/config.mk +++ b/core/config.mk @@ -118,6 +118,7 @@ include $(BUILD_SYSTEM)/envsetup.mk board_config_mk := \ $(strip $(wildcard \ $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \ + device/*/$(TARGET_DEVICE)/BoardConfig.mk \ vendor/*/$(TARGET_DEVICE)/BoardConfig.mk \ )) ifeq ($(board_config_mk),) diff --git a/core/product.mk b/core/product.mk index a9a24d2b1..541724200 100644 --- a/core/product.mk +++ b/core/product.mk @@ -23,7 +23,8 @@ # $(call ) isn't necessary. # define _find-android-products-files -$(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \ +$(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk) \ + $(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \ $(SRC_TARGET_DIR)/product/AndroidProducts.mk endef From 29c6c01bd609a53a06ae8d5a167e1d35fa04ed26 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 4 Mar 2010 17:31:28 -0800 Subject: [PATCH 3/5] Add provisioning app in the generic build Change-Id: Iffdd4d21a3c55e7a73d58289fda31ac8a27a18ac --- target/product/generic.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/generic.mk b/target/product/generic.mk index b4b1b0901..8c85ca68b 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -17,6 +17,7 @@ PRODUCT_PACKAGES := \ LatinIME \ Mms \ Music \ + Provision \ Settings \ Sync \ Updater \ From 99e087bc82c11d5909785acc7333176952a14032 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Mon, 8 Mar 2010 12:42:46 -0800 Subject: [PATCH 4/5] Added -lpthread to target LDFLAGS for sim-eng. This adds "-lpthread" to TARGET_GLOBAL_LDFLAGS when TARGET_SIMULATOR is true. This is much easier than inserting it into individual makefiles as needed. Has no effect on other builds. Should fix the sim-eng build breakage in libcameraservice. Change-Id: I4dcd7d54b93d1be1622b8ce78a1662d28ca9f9f2 --- core/combo/TARGET_linux-x86.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index b8f770f75..cd7d4b3d5 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -23,7 +23,7 @@ TARGET_CC := $(HOST_CC) TARGET_CXX := $(HOST_CXX) TARGET_AR := $(HOST_AR) TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32 -TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 +TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 -lpthread TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS) TARGET_ARCH_VARIANT := x86 else #simulator From d231c0648d038cf80cbbf37b63e351466eeca20a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Mon, 8 Mar 2010 18:04:03 -0800 Subject: [PATCH 5/5] Add an empty CleanSpec.mk Change-Id: Idc6adae88917383b19af0a7cfec88526cd6ac176 --- CleanSpec.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 CleanSpec.mk diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 000000000..b84e1b65e --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,49 @@ +# 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. +# + +# If you don't need to do a full clean build but would like to touch +# a file or delete some intermediate files, add a clean step to the end +# of the list. These steps will only be run once, if they haven't been +# run before. +# +# E.g.: +# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) +# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) +# +# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with +# files that are missing or have been moved. +# +# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. +# Use $(OUT_DIR) to refer to the "out" directory. +# +# If you need to re-do something that's already mentioned, just copy +# the command and add it to the bottom of the list. E.g., if a change +# that you made last week required touching a file and a change you +# made today requires touching the same file, just copy the old +# touch step and add it to the end of the list. +# +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ + +# For example: +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) +#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) +#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************