Aerodactyl: Move NTCamera into Aerodactyl-ntcamera

This commit is contained in:
Mashopy
2025-07-20 03:49:55 +02:00
parent 8aa7376f4b
commit 6d9d9b8ea4
12 changed files with 6 additions and 241 deletions
+1 -11
View File
@@ -7,12 +7,8 @@ PRODUCT_SOONG_NAMESPACES += \
PRODUCT_COPY_FILES += \
vendor/nothing/Aerodactyl/proprietary/product/etc/sysconfig/felica-allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/felica-allowlist.xml \
vendor/nothing/Aerodactyl/proprietary/system/etc/sysconfig/nothing-hiddenapi-package-allowlist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/nothing-hiddenapi-package-allowlist.xml \
vendor/nothing/Aerodactyl/proprietary/system_ext/etc/init/init.vtservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.vtservice.rc \
vendor/nothing/Aerodactyl/proprietary/system_ext/etc/permissions/advancedSample_camera_extensions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/advancedSample_camera_extensions.xml \
vendor/nothing/Aerodactyl/proprietary/system_ext/etc/permissions/com.nothing.feature.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.nothing.feature.xml \
vendor/nothing/Aerodactyl/proprietary/system_ext/etc/permissions/privapp-permissions-NTCamera.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-NTCamera.xml \
vendor/nothing/Aerodactyl/proprietary/system_ext/etc/permissions/privapp-permissions-NothingExperience.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-NothingExperience.xml \
vendor/nothing/Aerodactyl/proprietary/system_ext/etc/sysconfig/com.mediatek.ims.config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/com.mediatek.ims.config.xml \
vendor/nothing/Aerodactyl/proprietary/system_ext/framework/androidx.camera.extensions.impl.advanced.jar:$(TARGET_COPY_OUT_SYSTEM_EXT)/framework/androidx.camera.extensions.impl.advanced.jar \
vendor/nothing/Aerodactyl/proprietary/vendor/bin/crossbuild/DataSet/SQLiteModule/db/ae/mt6886/ParameterDB_ae.db:$(TARGET_COPY_OUT_VENDOR)/bin/crossbuild/DataSet/SQLiteModule/db/ae/mt6886/ParameterDB_ae.db \
@@ -420,7 +416,6 @@ PRODUCT_COPY_FILES += \
vendor/nothing/Aerodactyl/proprietary/vendor/firmware/wifi.cfg:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi.cfg
PRODUCT_PACKAGES += \
libnelib \
APUWareApusysAidlServer \
APUWareUtilsServer \
com.nothing.node.b2y \
@@ -1107,7 +1102,7 @@ PRODUCT_PACKAGES += \
vendor.mediatek.hardware.camera.bgservice@1.1 \
vendor.mediatek.hardware.camera.ccap@1.0 \
vendor.mediatek.hardware.camera.frhandler@1.0 \
vendor.mediatek.hardware.camera.isphal@1.0_vendor \
vendor.mediatek.hardware.camera.isphal@1.0 \
vendor.mediatek.hardware.camera.isphal@1.1 \
vendor.mediatek.hardware.camera.postproc@1.0 \
vendor.mediatek.hardware.camera.security@1.0 \
@@ -1181,15 +1176,12 @@ PRODUCT_PACKAGES += \
libimsma_socketwrapper \
libmtk_vt_service \
libmtk_vt_wrapper \
libmtkisp_metadata_sys \
libofflineproc_jni \
libsignal \
libsink-mtk \
libsource \
libvcodec_cap \
libvcodec_capenc \
libvt_avsync \
vendor.mediatek.hardware.camera.isphal@1.0 \
vendor.mediatek.hardware.mtkradioex@3.0 \
vendor.mediatek.hardware.videotelephony-V1-ndk \
vendor.mediatek.hardware.videotelephony@1.0 \
@@ -1198,8 +1190,6 @@ PRODUCT_PACKAGES += \
MobileFeliCaSettingApp \
MobileFeliCaWebPluginBoot \
ImsService \
NTCamera \
NothingExperience \
mediatek-common \
mediatek-framework \
mediatek-ims-base \
+5 -154
View File
@@ -10,29 +10,6 @@ soong_namespace {
],
}
cc_prebuilt_library_shared {
name: "libnelib",
owner: "nothing",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/system/lib64/libnelib.so",
],
shared_libs: [
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
prefer: true,
}
cc_prebuilt_library_shared {
name: "APUWareApusysAidlServer",
owner: "nothing",
@@ -1516,7 +1493,7 @@ cc_prebuilt_library_shared {
"libcamera_metadata",
"libhidlbase",
"libhidltransport",
"vendor.mediatek.hardware.camera.isphal@1.0_vendor",
"vendor.mediatek.hardware.camera.isphal@1.0",
"vendor.mediatek.hardware.camera.isphal@1.1",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.common@1.0",
@@ -7789,7 +7766,7 @@ cc_prebuilt_library_shared {
"libutils",
"libui",
"libmtkisp_metadata",
"vendor.mediatek.hardware.camera.isphal@1.0_vendor",
"vendor.mediatek.hardware.camera.isphal@1.0",
"libbase",
"libhidlbase",
"libbinder_ndk",
@@ -21880,8 +21857,7 @@ cc_prebuilt_library_shared {
}
cc_prebuilt_library_shared {
name: "vendor.mediatek.hardware.camera.isphal@1.0_vendor",
stem: "vendor.mediatek.hardware.camera.isphal@1.0",
name: "vendor.mediatek.hardware.camera.isphal@1.0",
owner: "nothing",
strip: {
none: true,
@@ -21924,7 +21900,7 @@ cc_prebuilt_library_shared {
shared_libs: [
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.2",
"vendor.mediatek.hardware.camera.isphal@1.0_vendor",
"vendor.mediatek.hardware.camera.isphal@1.0",
"libhidlbase",
"liblog",
"libutils",
@@ -24140,74 +24116,6 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
cc_prebuilt_library_shared {
name: "libmtkisp_metadata_sys",
owner: "nothing",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/system_ext/lib64/libmtkisp_metadata_sys.so",
],
shared_libs: [
"libui",
"liblog",
"libutils",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
prefer: true,
system_ext_specific: true,
}
cc_prebuilt_library_shared {
name: "libofflineproc_jni",
owner: "nothing",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/system_ext/lib64/libofflineproc_jni.so",
],
shared_libs: [
"libcamera_client",
"liblog",
"libcutils",
"libutils",
"libandroid_runtime",
"libnativehelper",
"libgui",
"libhidlbase",
"libaudiofoundation",
"libbinder",
"libmedia",
"libui",
"libvndksupport",
"vendor.mediatek.hardware.camera.isphal@1.0",
"libmtkisp_metadata_sys",
"libnativewindow",
"libcamera_metadata",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
prefer: true,
system_ext_specific: true,
}
cc_prebuilt_library_shared {
name: "libsignal",
owner: "nothing",
@@ -24404,36 +24312,6 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.mediatek.hardware.camera.isphal@1.0",
owner: "nothing",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/system_ext/lib64/vendor.mediatek.hardware.camera.isphal@1.0.so",
],
shared_libs: [
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.1",
"libhidlbase",
"liblog",
"libutils",
"libcutils",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
prefer: true,
system_ext_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.mediatek.hardware.mtkradioex@3.0",
owner: "nothing",
@@ -24583,33 +24461,6 @@ android_app_import {
system_ext_specific: true,
}
android_app_import {
name: "NTCamera",
owner: "nothing",
apk: "proprietary/system_ext/priv-app/NTCamera/NTCamera.apk",
overrides: [
"Camera2",
],
certificate: "platform",
dex_preopt: {
enabled: false,
},
privileged: true,
system_ext_specific: true,
}
android_app_import {
name: "NothingExperience",
owner: "nothing",
apk: "proprietary/system_ext/priv-app/NothingExperience/NothingExperience.apk",
certificate: "platform",
dex_preopt: {
enabled: false,
},
privileged: true,
system_ext_specific: true,
}
dex_import {
name: "mediatek-common",
owner: "nothing",
@@ -25328,7 +25179,7 @@ cc_prebuilt_binary {
"vendor.mediatek.hardware.camera.ccap@1.0",
"vendor.mediatek.hardware.camera.frhandler@1.0",
"vendor.mediatek.hardware.camera.postproc@1.0",
"vendor.mediatek.hardware.camera.isphal@1.0_vendor",
"vendor.mediatek.hardware.camera.isphal@1.0",
"vendor.mediatek.hardware.camera.isphal@1.1",
"vendor.mediatek.hardware.camera.bgservice@1.0",
"vendor.mediatek.hardware.camera.bgservice@1.1",
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This XML file declares which platform apps that need to access internal APIs.
-->
<config>
<hidden-api-whitelisted-app package="com.nothing.camera" />
</config>
Binary file not shown.
@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright (C) 2022 Nothing Technology Limited Inc.
* 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.
*/
-->
<permissions>
<feature name="com.nothing.feature" />
<feature name="com.nothing.feature.OS.V2_0"/>
<feature name="com.nothing.feature.OS.V2_5"/>
<feature name="com.nothing.feature.OS.V2_5_Beta2"/>
<feature name="com.nothing.feature.ntwidget.V1_2"/>
<feature name="com.nothing.feature.livewallpaper"/>
<feature name="com.nothing.feature.gallery"/>
</permissions>
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<permissions>
<privapp-permissions package="com.nothing.camera">
<permission name="android.permission.READ_EXTERNAL_STORAGE"/>
<permission name="android.permission.CAMERA"/>
<permission name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<permission name="android.permission.RECORD_AUDIO"/>
<permission name="android.permission.CONTROL_DISPLAY_BRIGHTNESS"/>
<permission name="android.permission.READ_PHONE_STATE" />
<permission name="android.permission.CONTROL_DEVICE_LIGHTS" />
<permission name="android.permission.DEVICE_POWER"/>
<permission name="android.permission.SYSTEM_CAMERA"/>
<permission name="mediatek.permission.ACCESS_APU_SYS"/>
<permission name="android.permission.STATUS_BAR" />
<permission name="android.permission.WRITE_SECURE_SETTINGS" />
</privapp-permissions>
</permissions>
@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 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
-->
<permissions>
<privapp-permissions package="com.nothing.experience">
<permission name="android.permission.ACCESS_NETWORK_STATE"/>
<permission name="android.permission.ACCESS_WIFI_STATE"/>
<permission name="android.permission.LOCAL_MAC_ADDRESS"/>
<permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
</privapp-permissions>
</permissions>
Binary file not shown.