From 060ed397f92d23b56bb5f9dcfa4c7cc59cd38ae5 Mon Sep 17 00:00:00 2001 From: matteo0026 Date: Mon, 29 Mar 2021 23:27:48 +0200 Subject: [PATCH] matisse-common: add soong namespace, remove libtime_genoff libtime_genoff is included in TheMuppets/proprietary_vendor_samsung/msm8226-common yet. --- Android.bp | 21 +++++++++++++++++++++ Android.mk | 11 ----------- matisse-common-vendor.mk | 4 +++- proprietary/vendor/lib/libtime_genoff.so | Bin 9224 -> 0 bytes 4 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 Android.bp delete mode 100644 proprietary/vendor/lib/libtime_genoff.so diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..2bc1dfa --- /dev/null +++ b/Android.bp @@ -0,0 +1,21 @@ +/** + * Copyright (C) 2019-2020 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. + * + * This file is generated by device/samsung/matisse-common/setup-makefiles.sh + */ + +soong_namespace { +} + diff --git a/Android.mk b/Android.mk index 168e3ae..e0b7cfc 100644 --- a/Android.mk +++ b/Android.mk @@ -19,17 +19,6 @@ LOCAL_PATH := $(call my-dir) ifneq ($(filter matissewifi matisse3g matisselte,$(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE := libtime_genoff -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := proprietary/vendor/lib/libtime_genoff.so -LOCAL_MULTILIB := 32 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -LOCAL_VENDOR_MODULE := true -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := TimeService LOCAL_MODULE_OWNER := samsung diff --git a/matisse-common-vendor.mk b/matisse-common-vendor.mk index 6f7f02d..056364c 100644 --- a/matisse-common-vendor.mk +++ b/matisse-common-vendor.mk @@ -15,6 +15,9 @@ # This file is generated by device/samsung/matisse-common/setup-makefiles.sh +PRODUCT_SOONG_NAMESPACES += \ + vendor/samsung/matisse-common + PRODUCT_COPY_FILES += \ vendor/samsung/matisse-common/proprietary/cameradata/datapattern_420sp.yuv:system/cameradata/datapattern_420sp.yuv \ vendor/samsung/matisse-common/proprietary/cameradata/datapattern_front_420sp.yuv:system/cameradata/datapattern_front_420sp.yuv \ @@ -161,5 +164,4 @@ PRODUCT_COPY_FILES += \ vendor/samsung/matisse-common/proprietary/vendor/lib/libxml.so:system/vendor/lib/libxml.so PRODUCT_PACKAGES += \ - libtime_genoff \ TimeService diff --git a/proprietary/vendor/lib/libtime_genoff.so b/proprietary/vendor/lib/libtime_genoff.so deleted file mode 100644 index 3b9f8826956cf86dcc9b1cea0fb657470994485a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9224 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