From: Ying Wang <wangying@google.com>
Date: Tue, 17 Nov 2015 01:16:47 +0000 (-0800)
Subject: Remove unnecessary inheritance layer between aliases.
X-Git-Tag: android-x86-7.1-r1~492^2~50^2~30^2~3^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cc2001fb446a613b0f89eb4fc2a11952f7a48d0a;p=android-x86%2Fbuild.git

Remove unnecessary inheritance layer between aliases.

The extra inheritance layer may cause multiple
PRODUCT_DEVICE/PRODUCT_BRAND values for a product if it doesn't
explicitly override them, eg. gms.
The full_* are deprecated product names. We keep them just for backward
compatibility, for some tools may still use the full_* product names.

Bug: 25611987
Change-Id: I7ecebd422754c3ceb16507b8d9ced65d533fe7c3
---

diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk
index 86b715cd9..781cae6a0 100644
--- a/target/product/aosp_arm.mk
+++ b/target/product/aosp_arm.mk
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
+include $(SRC_TARGET_DIR)/product/full.mk
 
 PRODUCT_NAME := aosp_arm
diff --git a/target/product/aosp_mips.mk b/target/product/aosp_mips.mk
index ceeb43373..a76b93a46 100644
--- a/target/product/aosp_mips.mk
+++ b/target/product/aosp_mips.mk
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_mips.mk)
+include $(SRC_TARGET_DIR)/product/full_mips.mk
 
 PRODUCT_NAME := aosp_mips
diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk
index 3e9b018a2..cba43c429 100644
--- a/target/product/aosp_x86.mk
+++ b/target/product/aosp_x86.mk
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_x86.mk)
+include $(SRC_TARGET_DIR)/product/full_x86.mk
 
 PRODUCT_NAME := aosp_x86