summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-10-11 16:05:24 +0200
committerMartin Elshuber <martin.elshuber@theobroma-systems.com>2017-10-11 16:05:24 +0200
commit7cf1a71a966f68011bff670cef5fa15bf6118513 (patch)
tree32ed07d771a631bb525967c0cf7515625948ef72
parenteb42fc8f1932066907b40a1398a952c8f4a064a1 (diff)
puma: fix lingering references to device/rockchip/rk3399
From the original import of Rockchip's SDK, there's still a few lingering references to device/rockchip/rk3399... we instead want to control things from our subtree (so we fix these references).
-rwxr-xr-xBoardConfig.mk3
-rwxr-xr-xdevice.mk14
-rwxr-xr-xproduct.mk2
-rwxr-xr-xrk3399.mk2
4 files changed, 10 insertions, 11 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d540d8c..084c9ba 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -67,8 +67,7 @@ BOARD_SENSOR_MPU_VR := true
# Copy rk3399 own init.rc file
# TARGET_PROVIDES_INIT_RC := true
-
-//MAX-SIZE=2G, for generate out/.../system.img
+# MAX-SIZE=2G, for generate out/.../system.img
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
# product has GPS or not
diff --git a/device.mk b/device.mk
index 5030b82..83ecbd3 100755
--- a/device.mk
+++ b/device.mk
@@ -186,13 +186,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.image-dex2oat-threads=2
PRODUCT_COPY_FILES += \
- device/rockchip/rk3399/package_performance.xml:system/etc/package_performance.xml
+ device/theobromasystems/puma/package_performance.xml:system/etc/package_performance.xml
-PRODUCT_COPY_FILES += \
- device/rockchip/rk3399/gps/gps.conf:system/etc/gps.conf \
- device/rockchip/rk3399/gps/u-blox.conf:system/etc/u-blox.conf \
- device/rockchip/rk3399/gps/lib64/gps.default.so:system/lib64/hw/gps.default.so \
- device/rockchip/rk3399/gps/lib32/gps.default.so:system/lib/hw/gps.default.so \
+#PRODUCT_COPY_FILES += \
+# device/rockchip/rk3399/gps/gps.conf:system/etc/gps.conf \
+# device/rockchip/rk3399/gps/u-blox.conf:system/etc/u-blox.conf \
+# device/rockchip/rk3399/gps/lib64/gps.default.so:system/lib64/hw/gps.default.so \
+# device/rockchip/rk3399/gps/lib32/gps.default.so:system/lib/hw/gps.default.so \
########################################################
# this product has GPS or not
@@ -240,4 +240,4 @@ PRODUCT_COPY_FILES += \
endif
PRODUCT_COPY_FILES += \
- device/rockchip/rk3399/public.libraries.txt:system/vendor/etc/public.libraries.txt
+ device/theobromasystems/puma/public.libraries.txt:system/vendor/etc/public.libraries.txt
diff --git a/product.mk b/product.mk
index 2ef938f..60aef4f 100755
--- a/product.mk
+++ b/product.mk
@@ -18,6 +18,6 @@
#
PRODUCT_RUNTIMES := runtime_libart_default
-$(call inherit-product, device/rockchip/rk3399/device.mk)
+$(call inherit-product, device/theobromasystems/puma/device.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
diff --git a/rk3399.mk b/rk3399.mk
index 46c6625..ce73a21 100755
--- a/rk3399.mk
+++ b/rk3399.mk
@@ -24,7 +24,7 @@
include device/theobromasystems/puma/BoardConfig.mk
# Inherit from those products. Most specific first.
-$(call inherit-product, device/rockchip/rk3399/product.mk)
+$(call inherit-product, device/theobromasystems/puma/product.mk)
$(call inherit-product, device/rockchip/common/device.mk)
PRODUCT_CHARACTERISTICS := tablet