diff options
| author | Ulrika Sjoberg <ulrika.sjoberg@stericsson.com> | 2011-04-05 16:33:31 +0200 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2011-04-11 10:07:44 +0200 |
| commit | 1777962eacd2114084d970c5aa3b6df72ce8f365 (patch) | |
| tree | e7ef607e29a6534000980f4398d00a82e0b0c07f | |
| parent | a67c031d51b8881f1021275e46571fc4a34b1860 (diff) | |
[Android] Remove use of ALL_PREBUILT
Removes the use of ALL_PREBUILT. Use of this parameter will be
forbidden in future releases of Android and it also prevents
builds of Android SDK.
Depends-On: I9b44253b4adf225da8ca449030c00f18fd19a637, Ic0c2d65a2dcb10198a07209c07282c8f52f985e5
ST-Ericsson ID: 328774, 321316
ST-Ericsson FOSS-OUT ID: NA
Change-Id: I0e46b03201e0d99ae8320ed7673767a67eff4688
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20084
Reviewed-by: Hans ODEBERG <hans.odeberg@stericsson.com>
Reviewed-by: Markus GRAPE <markus.grape@stericsson.com>
Tested-by: Ulrika SJOBERG <ulrika.sjoberg@stericsson.com>
Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com>
| -rw-r--r-- | Android.mk | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index acaf6806b..fcbbe6432 100644 --- a/Android.mk +++ b/Android.mk @@ -30,11 +30,31 @@ UBOOT_SET_SPLASH_IMAGE ?= $(LOCAL_PATH)/tools/logos/stericsson.bmp PRODUCT_COPY_FILES += $(UBOOT_SET_SPLASH_IMAGE):$(UBOOT_SPLASH_IMAGE_OUTPUT) endif -# Links the uboot build into the Android build -ALL_PREBUILT += build-uboot - -# Add mk_envimg to the build -ALL_PREBUILT += build-mkenvimg +include $(CLEAR_VARS) +UBOOT_LIBPATH := $(UBOOT_OUTPUT) +LOCAL_PATH := $(UBOOT_LIBPATH) +LOCAL_SRC_FILES := u-boot.bin +LOCAL_MODULE := $(LOCAL_SRC_FILES) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_PATH := $(PRODUCT_OUT) + +$(UBOOT_LIBPATH)/$(LOCAL_SRC_FILES) $(UBOOT_LIBPATH)/tools/mkimage: build-uboot +include $(BUILD_PREBUILT) + +ifdef BUILD_UBOOT_ENV_IMG_OUTPUT +include $(CLEAR_VARS) +ENVIMG_LIBPATH := $(dir $(BUILD_UBOOT_ENV_IMG_OUTPUT)) +LOCAL_PATH := $(ENVIMG_LIBPATH) +LOCAL_SRC_FILES := $(notdir $(BUILD_UBOOT_ENV_IMG_OUTPUT)) +LOCAL_MODULE := $(LOCAL_SRC_FILES) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_PATH := $(PRODUCT_OUT) + +$(ENVIMG_LIBPATH)/$(LOCAL_SRC_FILES): build-mkenvimg +include $(BUILD_PREBUILT) +endif # Configures, builds and installs uboot. UBOOT_DEFCONFIG usually # comes from the BoardConfig.mk file, but can be overridden on the |