diff options
| -rw-r--r-- | AndroidBoardCommon.mk | 17 | ||||
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rw-r--r-- | boot/Android.mk | 3 | ||||
| -rw-r--r-- | kernel | bin | 2179596 -> 0 bytes | |||
| -rw-r--r-- | overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml | 1 | ||||
| -rw-r--r-- | wlan.ko | bin | 637308 -> 0 bytes |
6 files changed, 4 insertions, 19 deletions
diff --git a/AndroidBoardCommon.mk b/AndroidBoardCommon.mk index 86daf0f..33b1e28 100644 --- a/AndroidBoardCommon.mk +++ b/AndroidBoardCommon.mk @@ -14,15 +14,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_PREBUILT_KERNEL),) -TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel -endif - -file := $(INSTALLED_KERNEL_TARGET) -ALL_PREBUILT += $(file) -$(file): $(TARGET_PREBUILT_KERNEL) | $(ACP) - $(transform-prebuilt-to-target) - $(call add-radio-file,recovery/images/firmware_error.565) $(call add-radio-file,recovery/images/bitmap_size.txt) @@ -37,12 +28,6 @@ LOCAL_MODULE := vold.fstab LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := wlan.ko -LOCAL_MODULE_TAGS := user -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) +ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET) -include vendor/htc/dream-sapphire/AndroidBoardCommonVendor.mk diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e9935a1..c16b8c1 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -22,7 +22,7 @@ # against the traditional rules of inheritance). USE_CAMERA_STUB := true --include vendor/htc/sapphire/BoardConfigVendor.mk +-include vendor/htc/dream-sapphire/BoardConfigCommonVendor.mk TARGET_BOARD_PLATFORM := msm7k TARGET_CPU_ABI := armeabi diff --git a/boot/Android.mk b/boot/Android.mk index 142b712..22fed29 100644 --- a/boot/Android.mk +++ b/boot/Android.mk @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +ifeq ($(TARGET_ARCH),arm) LOCAL_PATH:= $(call my-dir) ifneq ($(TARGET_SIMULATOR),true) @@ -32,4 +33,4 @@ LOCAL_MODULE := libboot_board_dream_sapphire include $(BUILD_RAW_STATIC_LIBRARY) endif # !TARGET_SIMULATOR - +endif Binary files differdiff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml index e311b83..01e6049 100644 --- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -18,5 +18,4 @@ --> <resources> <bool name="def_accelerometer_rotation">true</bool> - <string name="def_backup_transport">com.google.android.backup/.BackupTransportService</string> </resources> diff --git a/wlan.ko b/wlan.ko Binary files differdeleted file mode 100644 index 46a5827..0000000 --- a/wlan.ko +++ /dev/null |