diff --git a/Android.mk b/Android.mk index 606af4f..736dffe 100644 --- a/Android.mk +++ b/Android.mk @@ -1,83 +1,13 @@ -# -# Copyright (C) 2018-2019 The LineageOS Project -# -# SPDX-License-Identifier: Apache-2.0 -# - -LOCAL_PATH := $(call my-dir) - -ifneq ($(filter RMX1901 RMX1851,$(TARGET_DEVICE)),) -include $(call all-makefiles-under,$(LOCAL_PATH)) - -include $(CLEAR_VARS) - -# A/B builds require us to create the mount points at compile time. -# Just creating it for all cases since it does not hurt. -FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt -$(FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE) - @echo "Creating $(FIRMWARE_MOUNT_POINT)" - @mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt - -BT_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/bt_firmware -$(BT_FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE) - @echo "Creating $(BT_FIRMWARE_MOUNT_POINT)" - @mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware - -DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp -$(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE) - @echo "Creating $(DSP_MOUNT_POINT)" - @mkdir -p $(TARGET_OUT_VENDOR)/dsp - -ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT) - -RFS_MSM_ADSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/adsp/ -$(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating RFS MSM ADSP folder structure: $@" - @rm -rf $@/* - @mkdir -p $(dir $@)/readonly/vendor - $(hide) ln -sf /data/vendor/tombstones/rfs/lpass $@/ramdumps - $(hide) ln -sf /mnt/vendor/persist/rfs/msm/adsp $@/readwrite - $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared - $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware - $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware - -RFS_MSM_CDSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/cdsp/ -$(RFS_MSM_CDSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating RFS MSM CDSP folder structure: $@" - @rm -rf $@/* - @mkdir -p $(dir $@)/readonly/vendor - $(hide) ln -sf /data/vendor/tombstones/rfs/cdsp $@/ramdumps - $(hide) ln -sf /mnt/vendor/persist/rfs/msm/cdsp $@/readwrite - $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared - $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware - $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware - -RFS_MSM_MPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/mpss/ -$(RFS_MSM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating RFS MSM MPSS folder structure: $@" - @rm -rf $@/* - @mkdir -p $(dir $@)/readonly/vendor - $(hide) ln -sf /data/vendor/tombstones/rfs/modem $@/ramdumps - $(hide) ln -sf /mnt/vendor/persist/rfs/msm/mpss $@/readwrite - $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared - $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware - $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware - -RFS_MSM_SLPI_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/slpi/ -$(RFS_MSM_SLPI_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "Creating RFS MSM SLPI folder structure: $@" - @rm -rf $@/* - @mkdir -p $(dir $@)/readonly/vendor - $(hide) ln -sf /data/vendor/tombstones/rfs/slpi $@/ramdumps - $(hide) ln -sf /mnt/vendor/persist/rfs/msm/slpi $@/readwrite - $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared - $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware - $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware - -ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) - -endif +# +# Copyright (C) 2018-2019 The LineageOS Project +# +# SPDX-License-Identifier: Apache-2.0 +# + +LOCAL_PATH := $(call my-dir) + +ifneq ($(filter RMX1901 RMX1851,$(TARGET_DEVICE)),) +include $(call all-makefiles-under,$(LOCAL_PATH)) + +include $(CLEAR_VARS) +endif diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index b14db00..e7b6959 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -15,8 +15,6 @@ TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := cortex-a75 -TARGET_USES_64_BIT_BINDER := true - # Bootloader TARGET_BOOTLOADER_BOARD_NAME := sdm710 TARGET_NO_BOOTLOADER := true @@ -62,17 +60,11 @@ endif TARGET_ENABLE_MEDIADRM_64 := true # Graphics -NUM_FRAMEBUFFER_SURFACE_BUFFERS := 2 -TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := (1 << 21) | (1 << 27) TARGET_USES_HWC2 := true -OVERRIDE_RS_DRIVER := libRSDriver_adreno.so # HIDL DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml -# Lights -TARGET_PROVIDES_LIBLIGHT := true - # Power TARGET_TAP_TO_WAKE_NODE := "/proc/touchpanel/double_tap_enable" @@ -93,18 +85,16 @@ BOARD_ROOT_EXTRA_SYMLINKS := \ /vendor/firmware_mnt:/firmware TARGET_USERIMAGES_USE_EXT4 := true -TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false -TARGET_USES_MKE2FS := true - -TARGET_COPY_OUT_VENDOR := vendor # Recovery TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/recovery.fstab +# Renderscript +OVERRIDE_RS_DRIVER := libRSDriver_adreno.so + # RIL TARGET_PROVIDES_QTI_TELEPHONY_JAR := true -TARGET_RIL_VARIANT := caf # Sepolicy BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private @@ -113,4 +103,6 @@ BOARD_PLAT_PUBLIC_SEPOLICY_DIR += device/qcom/sepolicy/public # Treble BOARD_VNDK_VERSION := current -PRODUCT_FULL_TREBLE_OVERRIDE := true + +# Vendor +TARGET_COPY_OUT_VENDOR := vendor diff --git a/libhidl/Android.mk b/libhidl/Android.mk deleted file mode 100644 index 9d405a4..0000000 --- a/libhidl/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2017 The LineageOS 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. - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidltransport -LOCAL_MODULE := android.hidl.base@1.0 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidltransport -LOCAL_MODULE := android.hidl.manager@1.0 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidltransport -LOCAL_MODULE := android.hidl.base@1.0_system -LOCAL_INSTALLED_MODULE_STEM := android.hidl.base@1.0.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidltransport -LOCAL_MODULE := android.hidl.manager@1.0_system -LOCAL_INSTALLED_MODULE_STEM := android.hidl.manager@1.0.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -include $(BUILD_SHARED_LIBRARY) diff --git a/sdm710.mk b/sdm710.mk index 589abe6..a038d8e 100644 --- a/sdm710.mk +++ b/sdm710.mk @@ -49,13 +49,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ OppoDoze -# HIDL -PRODUCT_PACKAGES += \ - android.hidl.base@1.0 \ - android.hidl.base@1.0_system \ - android.hidl.manager@1.0 \ - android.hidl.manager@1.0_system - # IMS PRODUCT_PACKAGES += \ ims-ext-common @@ -72,11 +65,6 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml -# Seccomp policy -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ - $(LOCAL_PATH)/seccomp/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy - # RCS PRODUCT_PACKAGES += \ rcs_service_aidl \ @@ -107,10 +95,6 @@ PRODUCT_BOOT_JARS += \ PRODUCT_PACKAGES += \ textclassifier.bundle1 -# VNDK-SP -PRODUCT_PACKAGES += \ - vndk-sp - # Trust HAL PRODUCT_PACKAGES += \ lineage.trust@1.0-service diff --git a/seccomp/mediacodec-seccomp.policy b/seccomp/mediacodec-seccomp.policy deleted file mode 100644 index ff7d4d8..0000000 --- a/seccomp/mediacodec-seccomp.policy +++ /dev/null @@ -1,19 +0,0 @@ -# device specific syscalls -# extension of services/mediacodec/minijail/seccomp_policy/mediacodec-seccomp-arm.policy -pselect6: 1 -eventfd2: 1 -sendto: 1 -recvfrom: 1 -_llseek: 1 -sysinfo: 1 -getcwd: 1 -getdents64: 1 -ARM_cacheflush: 1 -inotify_init1: 1 -inotify_add_watch: 1 -inotify_rm_watch: 1 -uname: 1 -ueventd: 1 -timer_create: 1 -timer_settime: 1 -rt_sigtimedwait: 1 diff --git a/seccomp/mediaextractor-seccomp.policy b/seccomp/mediaextractor-seccomp.policy deleted file mode 100644 index 37201c8..0000000 --- a/seccomp/mediaextractor-seccomp.policy +++ /dev/null @@ -1,4 +0,0 @@ -# device specific syscalls. -# extension of services/mediaextractor/minijail/seccomp_policy/mediaextractor-seccomp-arm.policy -readlinkat: 1 -pread64: 1 diff --git a/vndk/Android.mk b/vndk/Android.mk deleted file mode 100644 index fd61bec..0000000 --- a/vndk/Android.mk +++ /dev/null @@ -1,49 +0,0 @@ -ifeq ($(BOARD_VNDK_VERSION),) -$(warning ************* BOARD VNDK is not enabled - compiling vndk-sp ***************************) -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/vndk-sp-libs.mk - -vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION) - -define define-vndk-sp-lib -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp-gen -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so -LOCAL_STRIP_MODULE := false -LOCAL_MULTILIB := first -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) -include $$(BUILD_PREBUILT) - -ifneq ($$(TARGET_2ND_ARCH),) -ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true) -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp-gen -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$($$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so -LOCAL_STRIP_MODULE := false -LOCAL_MULTILIB := 32 -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) -include $$(BUILD_PREBUILT) -endif # TARGET_TRANSLATE_2ND_ARCH is not true -endif # TARGET_2ND_ARCH is not empty -endef - -$(foreach lib,$(VNDK_SP_LIBRARIES),\ - $(eval $(call define-vndk-sp-lib,$(lib)))) - -include $(CLEAR_VARS) -LOCAL_MODULE := vndk-sp -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) -include $(BUILD_PHONY_PACKAGE) - -vndk_sp_dir := -endif diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk deleted file mode 100644 index 403413d..0000000 --- a/vndk/vndk-sp-libs.mk +++ /dev/null @@ -1,33 +0,0 @@ -VNDK_SP_LIBRARIES := \ - android.hardware.graphics.allocator@2.0 \ - android.hardware.graphics.mapper@2.0 \ - android.hardware.graphics.mapper@2.1 \ - android.hardware.graphics.common@1.0 \ - android.hardware.graphics.common@1.1 \ - android.hardware.renderscript@1.0 \ - android.hidl.base@1.0 \ - android.hidl.memory@1.0 \ - libRSCpuRef \ - libRSDriver \ - libRS_internal \ - libbacktrace \ - libbase \ - libbcinfo \ - libblas \ - libc++ \ - libcompiler_rt \ - libcutils \ - libft2 \ - libhardware \ - libhidlbase \ - libhidlmemory \ - libhidltransport \ - libhwbinder \ - libion \ - liblzma \ - libpng \ - libunwind \ - libunwindstack \ - libutils \ - libutilscallstack \ - libdexfile