diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-22 15:53:57 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2013-03-22 17:23:07 -0700 |
| commit | 5bc09174af27e38d9a5a7c029bee7254af79c7f3 (patch) | |
| tree | 046118e8c20933068de21c3a7fa4c48ed1e9d904 | |
| parent | 41b963d51ef76137f994c66e1abac23f1a0ea15b (diff) | |
| download | toro-5bc09174af27e38d9a5a7c029bee7254af79c7f3.tar.gz | |
Rename AOSP builds to aosp_*
Change-Id: Iac5b5914b5929c4faba2328cd23be7bab1dd8771
| -rw-r--r-- | AndroidProducts.mk | 1 | ||||
| -rw-r--r-- | aosp_toro.mk | 18 | ||||
| -rw-r--r-- | full_toro.mk | 6 |
3 files changed, 22 insertions, 3 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 8545718..840e39c 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,4 +15,5 @@ # PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/aosp_toro.mk \ $(LOCAL_DIR)/full_toro.mk diff --git a/aosp_toro.mk b/aosp_toro.mk new file mode 100644 index 0000000..037da3a --- /dev/null +++ b/aosp_toro.mk @@ -0,0 +1,18 @@ +# +# Copyright 2013 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. +# +$(call inherit-product, device/samsung/toro/full_toro.mk) + +PRODUCT_NAME := aosp_toro diff --git a/full_toro.mk b/full_toro.mk index 1ccab76..4ed4754 100644 --- a/full_toro.mk +++ b/full_toro.mk @@ -25,14 +25,14 @@ PRODUCT_PACKAGES := \ Gallery -#if we do this after the full_base_telephony is included some of these don't get picked up.. +# Do this before aosp_base_telephony is included since the first instance takes precedence PRODUCT_COPY_FILES += \ device/samsung/toro/bcmdhd.cal:system/etc/wifi/bcmdhd.cal \ device/sample/etc/apns-conf_verizon.xml:system/etc/apns-conf.xml \ frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml # Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) # This is where we'd set a backup provider if we had one #$(call inherit-product, device/sample/products/backup_overlay.mk) # Inherit from toro device @@ -42,5 +42,5 @@ $(call inherit-product, device/samsung/toro/device_vzw.mk) PRODUCT_NAME := full_toro PRODUCT_DEVICE := toro PRODUCT_BRAND := Android -PRODUCT_MODEL := Full AOSP on Toro-VZW +PRODUCT_MODEL := AOSP on Toro PRODUCT_RESTRICT_VENDOR_FILES := true |