diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-06-18 08:50:10 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2015-06-18 08:50:10 +0800 |
| commit | 659e55db6b53e9453a6ddcf0ef82d20dd8a76791 (patch) | |
| tree | 673c886c7e36170fb5e772ee08f6e8f62aa1712a | |
| parent | 909ef31e8d0d3f2e8bc7a71d553f714d74bca3e6 (diff) | |
| download | fvp-armv8-659e55db6b53e9453a6ddcf0ef82d20dd8a76791.tar.gz | |
clean up device.mk and use the common-device.mk file
remove uncessary lines in device.mk,
and move common feature for linaro supported boards to the
common-device.mk file in build git tree
Change-Id: I4c55598e595209af9f5a3b839274017fddb4b0a2
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | device.mk | 25 | ||||
| -rw-r--r-- | dhcpcd/Android.mk | 9 | ||||
| -rw-r--r-- | dhcpcd/android_dhcpcd.conf | 9 |
3 files changed, 2 insertions, 41 deletions
@@ -46,9 +46,6 @@ PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh # Build and run only ART PRODUCT_RUNTIMES := runtime_libart_default -# Copy dhcpcd -PRODUCT_PACKAGES += dhcpcd.conf - # Build gatord daemon for DS-5/Streamline PRODUCT_PACKAGES += gatord @@ -56,16 +53,9 @@ PRODUCT_PACKAGES += gatord PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc -#enable consle even built in user mode -ADDITIONAL_DEFAULT_PROPERTIES += ro.debuggable=1 - #set this product to use fake_battery ADDITIONAL_DEFAULT_PROPERTIES += ro.boot.fake_battery=1 -# set ART to use compilation mode -# ART will now what to pick up for compilation if this setting is not set. -ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter="" - PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ device/linaro/build/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \ frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \ @@ -75,20 +65,9 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml) -PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ - device/linaro/build/eth0_dns.sh:system/bin/eth0_dns.sh) - -PRODUCT_COPY_FILES += device/linaro/build/disablesuspend.sh:system/bin/disablesuspend.sh \ - $(LOCAL_PATH)/monkey_black_list:data/monkey_black_list - -# Copy media codecs config file -PRODUCT_COPY_FILES += device/linaro/build/media_codecs.xml:system/etc/media_codecs.xml - -# Include application and binaries needed for test -$(call inherit-product-if-exists, device/linaro/build/extra-and-tests.mk) +PRODUCT_COPY_FILES += $(LOCAL_PATH)/monkey_black_list:data/monkey_black_list -# Include Android userspace tests -$(call inherit-product-if-exists, external/linaro-android-userspace-test/product.mk) +$(call inherit-product-if-exists, device/linaro/build/common-device.mk) ####### Copy build and install howtos for this build ######## define copy-howto diff --git a/dhcpcd/Android.mk b/dhcpcd/Android.mk deleted file mode 100644 index bfa4821..0000000 --- a/dhcpcd/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -ifeq ($(strip $(TARGET_PRODUCT)),fvp) -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := dhcpcd.conf -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/dhcpcd -LOCAL_SRC_FILES := android_dhcpcd.conf -include $(BUILD_PREBUILT) -endif diff --git a/dhcpcd/android_dhcpcd.conf b/dhcpcd/android_dhcpcd.conf deleted file mode 100644 index b39ad73..0000000 --- a/dhcpcd/android_dhcpcd.conf +++ /dev/null @@ -1,9 +0,0 @@ -# dhcpcd configuration for Android Wi-Fi interface -# See dhcpcd.conf(5) for details. - -# Disable solicitation of IPv6 Router Advertisements -noipv6rs - -interface eth0 -# dhcpcd-run-hooks uses these options. -option subnet_mask, routers, domain_name_servers, interface_mtu |