klte-common: Migrate to COMMON_PATH

* Replace the LOCAL_PATH instances with a variable not prone to
  getting stomped
* Replace all expanded values with the variable

Change-Id: I91ef536c038fb38d250633bfdad82c2a6537c1da
This commit is contained in:
Kevin F. Haggerty 2017-12-28 19:37:11 -07:00
parent 207093e3bc
commit 86e804dce2
2 changed files with 14 additions and 14 deletions

View File

@ -16,9 +16,9 @@
# inherit from common msm8974 # inherit from common msm8974
-include device/samsung/msm8974-common/BoardConfigCommon.mk -include device/samsung/msm8974-common/BoardConfigCommon.mk
LOCAL_PATH := device/samsung/klte-common COMMON_PATH := device/samsung/klte-common
TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include
# ADB Legacy Interface # ADB Legacy Interface
TARGET_USES_LEGACY_ADB_INTERFACE := true TARGET_USES_LEGACY_ADB_INTERFACE := true
@ -31,8 +31,8 @@ USE_CUSTOM_AUDIO_POLICY := 1
TARGET_USES_64_BIT_BINDER := true TARGET_USES_64_BIT_BINDER := true
# Bluetooth # Bluetooth
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth
BOARD_CUSTOM_BT_CONFIG := $(LOCAL_PATH)/bluetooth/vnd_klte.txt BOARD_CUSTOM_BT_CONFIG := $(COMMON_PATH)/bluetooth/vnd_klte.txt
BOARD_HAVE_BLUETOOTH_BCM := true BOARD_HAVE_BLUETOOTH_BCM := true
BOARD_HAVE_SAMSUNG_BLUETOOTH := true BOARD_HAVE_SAMSUNG_BLUETOOTH := true
@ -47,11 +47,11 @@ USE_DEVICE_SPECIFIC_CAMERA := true
TARGET_KERNEL_HAVE_EXFAT := true TARGET_KERNEL_HAVE_EXFAT := true
# Filesystem # Filesystem
TARGET_FS_CONFIG_GEN := device/samsung/klte-common/config.fs TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
# HIDL # HIDL
DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
DEVICE_MATRIX_FILE := $(LOCAL_PATH)/compatibility_matrix.xml DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
# Kernel # Kernel
BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_BASE := 0x00000000
@ -80,38 +80,38 @@ TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_USE_F2FS := true TARGET_USERIMAGES_USE_F2FS := true
# Power HAL # Power HAL
TARGET_POWERHAL_SET_INTERACTIVE_EXT := $(LOCAL_PATH)/power/power_ext.c TARGET_POWERHAL_SET_INTERACTIVE_EXT := $(COMMON_PATH)/power/power_ext.c
TARGET_POWERHAL_VARIANT := qcom TARGET_POWERHAL_VARIANT := qcom
# Properties # Properties
TARGET_SYSTEM_PROP += device/samsung/klte-common/system.prop TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
# Radio # Radio
BOARD_PROVIDES_LIBRIL := true BOARD_PROVIDES_LIBRIL := true
TARGET_RIL_VARIANT := caf TARGET_RIL_VARIANT := caf
# Recovery # Recovery
BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/klte-common/recovery/recovery_keys.c BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../$(COMMON_PATH)/recovery/recovery_keys.c
BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_23x41.h\" BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_23x41.h\"
BOARD_USES_MMCUTILS := true BOARD_USES_MMCUTILS := true
BOARD_HAS_LARGE_FILESYSTEM := true BOARD_HAS_LARGE_FILESYSTEM := true
BOARD_HAS_NO_MISC_PARTITION := true BOARD_HAS_NO_MISC_PARTITION := true
BOARD_HAS_NO_SELECT_BUTTON := true BOARD_HAS_NO_SELECT_BUTTON := true
BOARD_RECOVERY_SWIPE := true BOARD_RECOVERY_SWIPE := true
TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/rootdir/etc/fstab.full TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.full
# SELinux # SELinux
-include device/qcom/sepolicy/sepolicy.mk -include device/qcom/sepolicy/sepolicy.mk
BOARD_SEPOLICY_DIRS += \ BOARD_SEPOLICY_DIRS += \
device/samsung/klte-common/sepolicy $(COMMON_PATH)/sepolicy
# Sensors # Sensors
TARGET_NO_SENSOR_PERMISSION_CHECK := true TARGET_NO_SENSOR_PERMISSION_CHECK := true
# TWRP Support - Optional # TWRP Support - Optional
ifeq ($(WITH_TWRP),true) ifeq ($(WITH_TWRP),true)
-include $(LOCAL_PATH)/twrp.mk -include $(COMMON_PATH)/twrp.mk
endif endif
# Use Snapdragon LLVM if available on build server # Use Snapdragon LLVM if available on build server

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TARGET_RECOVERY_DEVICE_DIRS += device/samsung/klte-common/twrp TARGET_RECOVERY_DEVICE_DIRS += $(COMMON_PATH)/twrp
RECOVERY_SDCARD_ON_DATA := true RECOVERY_SDCARD_ON_DATA := true
TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888" TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"