diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-06-18 09:57:52 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2015-06-18 09:57:52 +0800 |
| commit | 2e5b666e7f33b19402cdb60480553f84751ebe33 (patch) | |
| tree | 945bdc4da91bd5d0f07c7c2cd2b16a28756bcca3 | |
| parent | b5ba0f528661483de81669bc0d01bb65b2df60f3 (diff) | |
| download | vexpress-2e5b666e7f33b19402cdb60480553f84751ebe33.tar.gz | |
clean up the 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: I2188d8cfd5b9e179f93a0a708942cf0152b88965
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | device.mk | 15 | ||||
| -rw-r--r-- | dhcpcd/Android.mk | 9 | ||||
| -rw-r--r-- | dhcpcd/android_dhcpcd.conf | 9 |
3 files changed, 3 insertions, 30 deletions
@@ -81,11 +81,6 @@ endif $(call inherit-product-if-exists, test/linaro/biglittle/task-placement-tests/install-scripts.mk) $(call inherit-product-if-exists, test/linaro/biglittle/core/install-scripts.mk) -# Include application and binaries needed for test -$(call inherit-product-if-exists, device/linaro/build/extra-and-tests.mk) - -# Include Android userspace tests -$(call inherit-product-if-exists, external/linaro-android-userspace-test/product.mk) PRODUCT_PACKAGES += audio.primary.vexpress @@ -96,12 +91,8 @@ PRODUCT_COPY_FILES += \ # TODO(pattjin): Remove this when the TV Launcher is used, which does not support AppWidget. PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \ - frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \ - device/linaro/build/eth0_dns.sh:system/bin/eth0_dns.sh - - -$(call inherit-product-if-exists, external/linaro-android-kernel-test/product.mk) -$(call inherit-product-if-exists, system/extras/tests/bionic/libc/build-tests.mk) - + frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml $(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk) + +$(call inherit-product-if-exists, device/linaro/build/common-device.mk) diff --git a/dhcpcd/Android.mk b/dhcpcd/Android.mk deleted file mode 100644 index cb3a286..0000000 --- a/dhcpcd/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -ifeq ($(strip $(TARGET_PRODUCT)),vexpress) -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 |