diff options
author | nailyk-fr <nailyk_git@nailyk.fr> | 2017-02-09 12:46:57 +0100 |
---|---|---|
committer | nailyk-fr <nailyk_git@nailyk.fr> | 2017-02-21 20:16:59 +0100 |
commit | f603e0a41a501fde8bad9ba20547a743719fcaf4 (patch) | |
tree | 8f231f2468716b48583088c5a851661c9e327d7d | |
parent | bad9906576b3cc04e9f4c807321457ab240ae430 (diff) |
shinano-common: shim: Add MediaBufferGroup
* Add shim for MediaBufferGroup workaround
* Blobs have probably be built before this commit:
https://github.com/LineageOS/android_frameworks_av/commit/e9a5b96e7927fd4e38623e17ac73e8e4e25877ee
which cause libwvm.so not starting due to missing symbol ZN7android16MediaBufferGroupC1Ev
Change-Id: I490a2d599c01cd7d8db937d3a9d6eceffaf6a7e6
-rw-r--r-- | libshims/Android.mk | 29 | ||||
-rw-r--r-- | libshims/wvm.c | 21 | ||||
-rw-r--r-- | rootdir/init.qcom.rc | 1 | ||||
-rw-r--r-- | shinano.mk | 3 |
4 files changed, 53 insertions, 1 deletions
diff --git a/libshims/Android.mk b/libshims/Android.mk new file mode 100644 index 0000000..542e76d --- /dev/null +++ b/libshims/Android.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2016 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. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := wvm.c + +LOCAL_SHARED_LIBRARIES := libstagefright_foundation + +LOCAL_MODULE := libshims_wvm +LOCAL_MODULE_TAGS := optional + +LOCAL_32_BIT_ONLY := true + +include $(BUILD_SHARED_LIBRARY) diff --git a/libshims/wvm.c b/libshims/wvm.c new file mode 100644 index 0000000..422a6d5 --- /dev/null +++ b/libshims/wvm.c @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2016 The CyanogenMod 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. + */ + +/* MediaBufferGroup::MediaBufferGroup */ +int _ZN7android16MediaBufferGroupC1Ej(unsigned int); +int _ZN7android16MediaBufferGroupC1Ev() { + return _ZN7android16MediaBufferGroupC1Ej(0); +} diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 6b4af86..0b82c92 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -25,6 +25,7 @@ on early-init echo 8 8 8 8 > /proc/sys/kernel/printk on init + export LD_SHIM_LIBS /system/vendor/lib/libwvm.so|libshims_wvm.so symlink /dev/block/platform/msm_sdcc.1 /dev/block/bootdevice # Enable subsystem restart @@ -50,7 +50,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ libc_ndk \ tad_static \ - wait4tad_static + wait4tad_static \ + libshims_wvm # ANT+ PRODUCT_PACKAGES += \ |