marlin: clean up build

1) Disable SELinux until the policies are updated (b/26984551) 2) move some files to top level, eventually common/ will be removed 3) start moving lines from common/*mk to the appropriate top level makefile 4) start removing unused directories and files Bug: 26984551 Change-Id: Ic8b9226a6e9506b2655906ab1550679394b5b43c
nychitman1 · Feb 4, 2016 · ceb7fc4 · ceb7fc4
1 parent 2454324
commit ceb7fc4
Show file tree

Hide file tree

Showing 32 changed files with 99 additions and 1,241 deletions.
diff --git a/AndroidBoard.mk b/AndroidBoard.mk
@@ -1,3 +1,5 @@
+$(error this file should be UNUSED!)
+
 TARGET_BOOTIMG_SIGNED := false
 TARGET_NO_BOOTLOADER := true
 

diff --git a/aosp_marlin.mk b/aosp_marlin.mk
@@ -24,7 +24,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 PRODUCT_NAME := aosp_marlin
 #PRODUCT_BRAND := Android
 PRODUCT_MODEL := AOSP on msm8996
-PRODUCT_MANUFACTURER := HTC
+PRODUCT_MANUFACTURER := google
 PRODUCT_RESTRICT_VENDOR_FILES := true
 
 $(call inherit-product, device/google/marlin/device-marlin.mk)

diff --git a/aosp_sailfish.mk b/aosp_sailfish.mk
@@ -24,7 +24,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 PRODUCT_NAME := aosp_sailfish
 #PRODUCT_BRAND := Android
 PRODUCT_MODEL := AOSP on msm8996
-PRODUCT_MANUFACTURER := HTC
+PRODUCT_MANUFACTURER := google
 PRODUCT_RESTRICT_VENDOR_FILES := true
 
 $(call inherit-product, device/google/marlin/device-sailfish.mk)

diff --git a/board-info.txt b/board-info.txt
diff --git a/common/appops/Android.mk b/common/appops/Android.mk
diff --git a/common/appops/README.txt b/common/appops/README.txt
diff --git a/common/appops/appops_policy.xml b/common/appops/appops_policy.xml