universal7885: camera.provider: Rebrand to exynos7885

* Also, use our hidden cam number (50)

Change-Id: I4d7a11b32c260d32dcd9427a98ac4c6ef94c1e03
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
This commit is contained in:
roynatech2544 2022-02-18 16:14:48 +09:00
commit 18f76093fa
No known key found for this signature in database
GPG key ID: 9675C32163D88D30
3 changed files with 5 additions and 27 deletions

View file

@ -13,38 +13,19 @@
// 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.
soong_config_module_type {
name: "exynos9820_model",
module_type: "cc_defaults",
config_namespace: "exynos9820CameraVars",
value_variables: ["exynos9820_model"],
properties: ["cppflags"],
}
exynos9820_model {
name: "exynos9820_model_defaults",
soong_config_variables: {
exynos9820_model: {
cppflags: ["-DEXYNOS9820_MODEL_%s"],
},
},
}
cc_binary { cc_binary {
name: "android.hardware.camera.provider@2.5-service_64.exynos9820", name: "android.hardware.camera.provider@2.5-service.exynos7885",
defaults: [ defaults: [
"hidl_defaults", "hidl_defaults",
"exynos9820_model_defaults",
], ],
compile_multilib: "64", compile_multilib: "32",
proprietary: true, proprietary: true,
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [
"SamsungCameraProvider.cpp", "SamsungCameraProvider.cpp",
"service.cpp" "service.cpp"
], ],
init_rc: ["android.hardware.camera.provider@2.5-service_64.exynos9820.rc"], init_rc: ["android.hardware.camera.provider@2.5-service.exynos7885.rc"],
shared_libs: [ shared_libs: [
"android.hardware.camera.provider@2.4", "android.hardware.camera.provider@2.4",
"android.hardware.camera.provider@2.4-legacy", "android.hardware.camera.provider@2.4-legacy",

View file

@ -26,10 +26,7 @@ using ::android::OK;
const int kMaxCameraIdLen = 16; const int kMaxCameraIdLen = 16;
SamsungCameraProvider::SamsungCameraProvider() : LegacyCameraProviderImpl_2_5() { SamsungCameraProvider::SamsungCameraProvider() : LegacyCameraProviderImpl_2_5() {
#ifndef EXYNOS9820_MODEL_beyond0lte mExtraIDs.push_back(50);
// ID=52 is telephoto
mExtraIDs.push_back(52);
#endif
if (!mInitFailed) { if (!mInitFailed) {
for (int i : mExtraIDs) { for (int i : mExtraIDs) {

View file

@ -1,4 +1,4 @@
service vendor.camera-provider-2-5 /vendor/bin/hw/android.hardware.camera.provider@2.5-service_64.exynos9820 service vendor.camera-provider-2-5 /vendor/bin/hw/android.hardware.camera.provider@2.5-service.exynos7885
interface android.hardware.camera.provider@2.5::ICameraProvider legacy/0 interface android.hardware.camera.provider@2.5::ICameraProvider legacy/0
interface android.hardware.camera.provider@2.4::ICameraProvider legacy/0 interface android.hardware.camera.provider@2.4::ICameraProvider legacy/0
class hal class hal