aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aicp.dependencies22
-rw-r--r--aicp.mk (renamed from cm.mk)5
-rw-r--r--cm.dependencies16
-rwxr-xr-xvendorsetup.sh19
4 files changed, 24 insertions, 38 deletions
diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 0000000..f62dc1e
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,22 @@
+[
+ {
+ "repository": "AICP/device_amazon_otter-common",
+ "target_path": "device/amazon/otter-common",
+ "branch": "lp5.1"
+ },
+ {
+ "repository": "CyanogenMod/android_device_amazon_omap4-common",
+ "target_path": "device/amazon/omap4-common",
+ "branch": "cm-12.1"
+ },
+ {
+ "repository": "CyanogenMod/android_kernel_amazon_otter-common",
+ "target_path": "kernel/amazon/otter-common",
+ "branch": "cm-12.1"
+ },
+ {
+ "repository": "TheMuppets/proprietary_vendor_amazon",
+ "target_path": "vendor/amazon",
+ "branch": "cm-12.1"
+ }
+]
diff --git a/cm.mk b/aicp.mk
index a09febf..e5270ee 100644
--- a/cm.mk
+++ b/aicp.mk
@@ -13,9 +13,8 @@
# limitations under the License.
# Inherit device configuration for Kindle Fire
-$(call inherit-product, device/amazon/otter-common/cm.mk)
+$(call inherit-product, device/amazon/otter-common/aicp.mk)
$(call inherit-product, device/amazon/otterx/full_otterx.mk)
-PRODUCT_NAME := cm_otterx
+PRODUCT_NAME := aicp_otterx
PRODUCT_RELEASE_NAME := KFire
-
diff --git a/cm.dependencies b/cm.dependencies
deleted file mode 100644
index 332aa52..0000000
--- a/cm.dependencies
+++ /dev/null
@@ -1,16 +0,0 @@
-[
- {
- "repository": "android_device_amazon_otter-common",
- "target_path": "device/amazon/otter-common"
- },
- {
- "repository": "android_device_amazon_omap4-common",
- "target_path": "device/amazon/omap4-common"
- },
- {
- "repository": "android_kernel_amazon_otter-common",
- "target_path": "kernel/amazon/otter-common"
- }
-]
-
-
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100755
index 7483181..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-add_lunch_combo full_otterx-userdebug
-add_lunch_combo cm_otterx-userdebug
-