diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:03:49 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:03:49 -0800 |
| commit | dcc08f073b6873c69ab891d4f69f7c568e282df7 (patch) | |
| tree | cbaa218be3f46078555b6bfb36c48659096a747a /target | |
| parent | d3aa4000e42fd1036e0e3286843c5132f905d754 (diff) | |
| download | build-dcc08f073b6873c69ab891d4f69f7c568e282df7.zip build-dcc08f073b6873c69ab891d4f69f7c568e282df7.tar.gz build-dcc08f073b6873c69ab891d4f69f7c568e282df7.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'target')
| -rw-r--r-- | target/board/Android.mk | 6 | ||||
| -rw-r--r-- | target/product/core.mk | 3 | ||||
| -rw-r--r-- | target/product/generic.mk | 1 | ||||
| -rw-r--r-- | target/product/sdk.mk | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/target/board/Android.mk b/target/board/Android.mk index 07d9854..4d34969 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -26,17 +26,17 @@ else INSTALLED_RADIOIMAGE_TARGET := endif -include $(TARGET_PRODUCT_DIR)/Android.mk +include $(TARGET_DEVICE_DIR)/Android.mk # Generate a file that contains various information about the # device we're building for. This file is typically packaged up # with everything else. # -# If the file "board-info.txt" appears in $(TARGET_PRODUCT_DIR), +# If the file "board-info.txt" appears in $(TARGET_DEVICE_DIR), # it will be appended to the output file. # INSTALLED_ANDROID_INFO_TXT_TARGET := $(PRODUCT_OUT)/android-info.txt -board_info_txt := $(wildcard $(TARGET_PRODUCT_DIR)/board-info.txt) +board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt) $(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt) $(call pretty,"Generated: ($@)") $(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@ diff --git a/target/product/core.mk b/target/product/core.mk index af32cbf..534925f 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -1,6 +1,7 @@ PRODUCT_BRAND := PRODUCT_NAME := PRODUCT_DEVICE := +PRODUCT_POLICY := android.policy_phone PRODUCT_PROPERTY_OVERRIDES := \ ro.config.notification_sound=F1_New_SMS.ogg @@ -14,8 +15,6 @@ PRODUCT_PACKAGES := \ ContactsProvider \ DownloadProvider \ GoogleSearch \ - ImProvider \ - ImCredentialProvider \ MediaProvider \ SettingsProvider \ TelephonyProvider \ diff --git a/target/product/generic.mk b/target/product/generic.mk index 5046443..b9bc070 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -8,6 +8,7 @@ PRODUCT_PACKAGES := \ Calendar \ Camera \ DrmProvider \ + LatinIME \ Mms \ Music \ Settings \ diff --git a/target/product/sdk.mk b/target/product/sdk.mk index a0bf830..ae8fa45 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -4,6 +4,7 @@ PRODUCT_PACKAGES := \ ApiDemos \ Development \ Fallback \ + GPSEnable $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) |