diff --git a/a10/device.mk b/a10/device.mk index 4d85aaa..7f3440d 100644 --- a/a10/device.mk +++ b/a10/device.mk @@ -15,6 +15,5 @@ TARGET_SCREEN_HEIGHT := 1560 TARGET_SCREEN_WIDTH := 720 PRODUCT_PACKAGES += \ - fstab.exynos7884B \ - ueventd.exynos7885.rc + fstab.exynos7884B diff --git a/a20/device.mk b/a20/device.mk index ed14934..b90deb7 100644 --- a/a20/device.mk +++ b/a20/device.mk @@ -21,8 +21,7 @@ TARGET_SCREEN_WIDTH := 720 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml PRODUCT_PACKAGES += \ - fstab.exynos7884B \ - ueventd.exynos7885.rc + fstab.exynos7884B PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/a20e/device.mk b/a20e/device.mk index 3b56dcc..3adf755 100644 --- a/a20e/device.mk +++ b/a20e/device.mk @@ -21,8 +21,7 @@ TARGET_SCREEN_WIDTH := 720 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml PRODUCT_PACKAGES += \ - fstab.exynos7884B \ - ueventd.exynos7885.rc + fstab.exynos7884B PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/a30/device.mk b/a30/device.mk index 40b2c30..baab9a9 100644 --- a/a30/device.mk +++ b/a30/device.mk @@ -20,8 +20,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml PRODUCT_PACKAGES += \ - fstab.exynos7904 \ - ueventd.exynos7885.rc + fstab.exynos7904 PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/a40/device.mk b/a40/device.mk index e2cb8fb..cd2216b 100644 --- a/a40/device.mk +++ b/a40/device.mk @@ -20,8 +20,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml PRODUCT_PACKAGES += \ - fstab.exynos7904 \ - ueventd.exynos7885.rc - + fstab.exynos7904 + PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-service diff --git a/universal7885-common/rootdir/Android.bp b/universal7885-common/rootdir/Android.bp new file mode 100644 index 0000000..2628100 --- /dev/null +++ b/universal7885-common/rootdir/Android.bp @@ -0,0 +1,66 @@ +// Copyright 2019 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. + +prebuilt_etc { + name: "fstab.enableswap", + src: "etc/fstab.enableswap", + vendor: true, +} + +prebuilt_etc { + name: "init.exynos7885.rc", + src: "etc/init.exynos7885.rc", + sub_dir: "init", + vendor: true, +} + +prebuilt_etc { + name: "init.exynos7885.usb.rc", + src: "etc/init.exynos7885.usb.rc", + sub_dir: "init", + vendor: true, +} + +prebuilt_etc { + name: "wifi_sec.rc", + src: "etc/wifi_sec.rc", + sub_dir: "init", + vendor: true, +} + +prebuilt_etc { + name: "fstab.exynos7884B", + src: "etc/fstab.exynos7884B", + vendor: true, +} + +prebuilt_etc { + name: "fstab.exynos7904", + src: "etc/fstab.exynos7904", + vendor: true, +} + +prebuilt_etc { + name: "init.target.rc", + src: "etc/init.target.rc", + sub_dir: "init", + vendor: true, +} + +prebuilt_etc { + name: "init.baseband.rc", + src: "etc/init.baseband.rc", + sub_dir: "init", + vendor: true, +} diff --git a/universal7885-common/rootdir/Android.mk b/universal7885-common/rootdir/Android.mk deleted file mode 100644 index d8f7860..0000000 --- a/universal7885-common/rootdir/Android.mk +++ /dev/null @@ -1,74 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := fstab.enableswap -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.exynos7885.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.exynos7885.usb.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := ueventd.exynos7885.rc -LOCAL_MODULE_STEM := ueventd.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE_STEM) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := wifi_sec.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := fstab.exynos7884B -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := fstab.exynos7904 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.target.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.baseband.rc -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/$(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init -include $(BUILD_PREBUILT) diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 61d392c..80a65af 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -265,6 +265,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ secril_config_svc +# Ueventd +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/rootdir/etc/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc + # Screen density PRODUCT_AAPT_CONFIG := normal PRODUCT_AAPT_PREF_CONFIG := xxhdpi