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

Commit c01cf7b9 authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of 2b8d2383 to gingerbread 

Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
parents 71affe70 2b8d2383

core/envsetup.mk

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ $(info TARGET_PRODUCT=$(TARGET_PRODUCT)) 
$(info   TARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT))

$(info   TARGET_SIMULATOR=$(TARGET_SIMULATOR))

$(info   TARGET_BUILD_TYPE=$(TARGET_BUILD_TYPE))

$(info   TARGET_BUILD_APPS=$(TARGET_BUILD_APPS))

$(info   TARGET_ARCH=$(TARGET_ARCH))

$(info   HOST_ARCH=$(HOST_ARCH))

$(info   HOST_OS=$(HOST_OS))

core/main.mk

+50 −52
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ TOPDIR := 
BUILD_SYSTEM := $(TOPDIR)build/core



# This is the default target.  It must be the first declared target.

.PHONY: droid

DEFAULT_GOAL := droid

$(DEFAULT_GOAL):
@@ -688,25 +689,29 @@ droidcore: files \ 
	$(INSTALLED_USERDATAIMAGE_TARGET) \

	$(INSTALLED_FILES_FILE)



# The actual files built by the droidcore target changes depending

# on the build variant.

.PHONY: droid tests

ifeq ($(strip $(is_unbundled_app_build)),true)

ifneq ($(TARGET_BUILD_APPS),)

  # If this build is just for apps, only build apps and not the full system by default.



  unbundled_build_modules :=

ifdef UNBUNDLED_APPS

unbundled_build_modules := $(UNBUNDLED_APPS)

else # UNBUNDLED_APPS

# Otherwise we build all modules in the source tree.

  ifneq ($(filter all,$(TARGET_BUILD_APPS)),)

    # If they used the magic goal "all" then build everything

    unbundled_build_modules := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS)))

endif # UNBUNDLED_APPS

droid: $(unbundled_build_modules)

else # is_unbundled_app_build

droid: droidcore

endif # is_unbundled_app_build

tests: droidcore

  else

    unbundled_build_modules := $(TARGET_BUILD_APPS)

  endif



ifneq ($(strip $(is_unbundled_app_build)),true)

$(call dist-for-goals, droid, \

  # dist the unbundled app.

  $(call dist-for-goals,apps_only, \

    $(foreach m,$(unbundled_build_modules),$(ALL_MODULES.$(m).INSTALLED)) \

  )



.PHONY: apps_only

apps_only: $(unbundled_build_modules)



droid: apps_only



else # TARGET_BUILD_APPS

  $(call dist-for-goals, droidcore, \

    $(INTERNAL_UPDATE_PACKAGE_TARGET) \

    $(INTERNAL_OTA_PACKAGE_TARGET) \

    $(SYMBOLS_ZIP) \
@@ -717,14 +722,7 @@ $(call dist-for-goals, droid, \ 
    $(INSTALLED_BUILD_PROP_TARGET) \

    $(BUILT_TARGET_FILES_PACKAGE) \

    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

	$(INSTALLED_RAMDISK_TARGET) \

 )



ifeq ($(EMMA_INSTRUMENT),true)

$(call dist-for-goals, droid, \

	$(EMMA_META_ZIP) \

   )

endif



  # Tests are installed in userdata.img.  If we're building the tests

  # variant, copy it for "make tests dist".  Also copy a zip of the
@@ -737,14 +735,14 @@ $(call dist-for-goals, droid, \ 
   )

  endif



else # is_unbundled_app_build

# dist the unbundled app.

ifdef UNBUNDLED_APPS

  $(call dist-for-goals,droid, \

    $(foreach m,$(UNBUNDLED_APPS),$(ALL_MODULES.$(m).INSTALLED)) \

  )

endif # UNBUNDLED_APPS

endif # is_unbundled_app_build

# Building a full system-- the default is to build droidcore

droid: droidcore



endif





.PHONY: droid tests

tests: droidcore



.PHONY: docs

docs: $(ALL_DOCS)

core/package.mk

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ PACKAGES.$(LOCAL_PACKAGE_NAME).CERTIFICATE := $(certificate) 
# Define the rule to build the actual package.

$(LOCAL_BUILT_MODULE): $(AAPT) | $(ZIPALIGN)

$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries)

ifeq ($(strip $(is_unbundled_app_build)),true)

ifneq ($(TARGET_BUILD_APPS),)

    # Include all resources for unbundled apps.

    $(LOCAL_BUILT_MODULE): PRODUCT_AAPT_CONFIG :=

endif

core/product_config.mk

+3 −4
Original line number Diff line number Diff line
@@ -157,13 +157,12 @@ ifdef unbundled_goals 
  ifneq ($(words $(unbundled_goals)),1)

    $(error Only one APP-* goal may be specified; saw "$(unbundled_goals)"))

  endif

  UNBUNDLED_APPS := $(strip $(subst -, ,$(patsubst APP-%,%,$(unbundled_goals))))

  TARGET_BUILD_APPS := $(strip $(subst -, ,$(patsubst APP-%,%,$(unbundled_goals))))

  ifneq ($(filter $(DEFAULT_GOAL),$(MAKECMDGOALS)),)

    MAKECMDGOALS := $(patsubst $(unbundled_goals),,$(MAKECMDGOALS))

  else

    MAKECMDGOALS := $(patsubst $(unbundled_goals),$(DEFAULT_GOAL),$(MAKECMDGOALS))

  endif

  is_unbundled_app_build := true



.PHONY: $(unbundled_goals)

$(unbundled_goals): $(MAKECMDGOALS)
@@ -178,7 +177,7 @@ include $(BUILD_SYSTEM)/node_fns.mk 
include $(BUILD_SYSTEM)/product.mk

include $(BUILD_SYSTEM)/device.mk



ifeq ($(strip $(is_unbundled_app_build)),true)

ifneq ($(strip $(TARGET_BUILD_APPS)),)

  # An unbundled app build needs only the core product makefiles.

  $(call import-products,$(call get-product-makefiles,\

      $(SRC_TARGET_DIR)/product/AndroidProducts.mk))
@@ -189,7 +188,7 @@ else 
  #TODO: when we start allowing direct pointers to product files,

  #    guarantee that they're in this list.

  $(call import-products, $(get-all-product-makefiles))

endif # is_unbundled_app_build

endif # TARGET_BUILD_APPS

$(check-all-products)

#$(dump-products)

#$(error done)

envsetup.sh

+36 −9
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ function check_product() 
    CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \

        TARGET_PRODUCT=$1 TARGET_BUILD_VARIANT= \

        TARGET_SIMULATOR= TARGET_BUILD_TYPE= \

        TARGET_BUILD_APPS= \

        get_build_var TARGET_DEVICE > /dev/null

    # hide successful answers, but allow the errors to show

}
@@ -150,9 +151,14 @@ function set_sequence_number() 
function settitle()

{

    if [ "$STAY_OFF_MY_LAWN" = "" ]; then

        local product=$(get_build_var TARGET_PRODUCT)

        local variant=$(get_build_var TARGET_BUILD_VARIANT)

        local product=$TARGET_PRODUCT

        local variant=$TARGET_BUILD_VARIANT

        local apps=$TARGET_BUILD_APPS

        if [ -z "$apps" ]; then

            export PROMPT_COMMAND="echo -ne \"\033]0;[${product}-${variant}] ${USER}@${HOSTNAME}: ${PWD}\007\""

        else

            export PROMPT_COMMAND="echo -ne \"\033]0;[$apps $variant] ${USER}@${HOSTNAME}: ${PWD}\007\""

        fi

    fi

}
@@ -376,11 +382,6 @@ function choosevariant() 
    done

}



function tapas()

{

    choosecombo

}



function choosecombo()

{

    choosesim $1
@@ -432,7 +433,6 @@ function print_lunch_menu() 
    echo

    echo "You're building on" $uname

    echo

    echo ${LUNCH_MENU_CHOICES[@]}

    echo "Lunch menu... pick a combo:"



    local i=1
@@ -484,6 +484,8 @@ function lunch() 
        return 1

    fi



    export TARGET_BUILD_APPS=



    # special case the simulator

    if [ "$selection" = "simulator" ]

    then
@@ -530,6 +532,31 @@ function lunch() 
    printconfig

}



# Configures the build to build unbundled apps.

# Run tapas with one ore more app names (from LOCAL_PACKAGE_NAME)

function tapas()

{

    local variant=$(echo -n $(echo $* | xargs -n 1 echo | grep -E '^(user|userdebug|eng)$'))

    local apps=$(echo -n $(echo $* | xargs -n 1 echo | grep -E -v '^(user|userdebug|eng)$'))



    if [ $(echo $variant | wc -w) -gt 1 ]; then

        echo "tapas: Error: Multiple build variants supplied: $variant"

        return

    fi

    if [ -z "$variant" ]; then

        variant=eng

    fi



    export TARGET_PRODUCT=generic

    export TARGET_BUILD_VARIANT=$variant

    export TARGET_SIMULATOR=false

    export TARGET_BUILD_TYPE=release

    export TARGET_BUILD_APPS=$apps



    set_stuff_for_environment

    printconfig

}



function gettop

{

    local TOPFILE=build/core/envsetup.mk