diff options
| -rw-r--r-- | device-common.mk | 32 | ||||
| -rw-r--r-- | hifi/xaf/host-apf/Android.bp | 32 | ||||
| -rw-r--r-- | hikey960/device-hikey960.mk | 6 | ||||
| -rw-r--r-- | vndk/Android.mk | 28 |
4 files changed, 36 insertions, 62 deletions
diff --git a/device-common.mk b/device-common.mk index 5d38628d..9013f032 100644 --- a/device-common.mk +++ b/device-common.mk @@ -247,38 +247,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.common.rc \ -PRODUCT_PACKAGES += \ - android.hardware.renderscript@1.0.vndk-sp\ - android.hardware.graphics.composer@2.1.vndk-sp\ - android.hardware.graphics.allocator@2.0.vndk-sp\ - android.hardware.graphics.mapper@2.0.vndk-sp\ - android.hardware.graphics.common@1.0.vndk-sp\ - libvndksupport.vndk-sp\ - libbinder.vndk-sp\ - libhwbinder.vndk-sp\ - libbase.vndk-sp\ - libfmq.vndk-sp\ - libcutils.vndk-sp\ - libhardware.vndk-sp\ - libhidlbase.vndk-sp\ - libhidltransport.vndk-sp\ - libui.vndk-sp\ - libutils.vndk-sp\ - libc++.vndk-sp\ - libRS_internal.vndk-sp\ - libRSDriver.vndk-sp\ - libRSCpuRef.vndk-sp\ - libbcinfo.vndk-sp\ - libblas.vndk-sp\ - libft2.vndk-sp\ - libpng.vndk-sp\ - libcompiler_rt.vndk-sp\ - libbacktrace.vndk-sp\ - libunwind.vndk-sp\ - libunwindstack.vndk-sp\ - liblzma.vndk-sp\ - libion.vndk-sp\ - # Health PRODUCT_PACKAGES += \ android.hardware.health@2.0-service \ diff --git a/hifi/xaf/host-apf/Android.bp b/hifi/xaf/host-apf/Android.bp new file mode 100644 index 00000000..7bd20057 --- /dev/null +++ b/hifi/xaf/host-apf/Android.bp @@ -0,0 +1,32 @@ +// Copyright (C) 2020 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. + +cc_prebuilt_binary { + name: "dhifimesg", + srcs: ["tools/dhifimesg"], + shared_libs: [ + "libutils", + "liblog", + "libbinder", + "libc++", + "libdl", + "libc", + "libm", + ], + compile_multilib: "64", + vendor: true, + strip: { + none: true, + }, +} diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index 9bde93b8..5a423c11 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -38,8 +38,10 @@ PRODUCT_COPY_FILES += \ # Copy hifi firmware PRODUCT_COPY_FILES += \ - device/linaro/hikey/hifi/firmware/hifi-hikey960.img:$(TARGET_COPY_OUT_VENDOR)/firmware/hifi/hifi.img \ - device/linaro/hikey/hifi/xaf/host-apf/tools/dhifimesg:/vendor/bin/dhifimesg + device/linaro/hikey/hifi/firmware/hifi-hikey960.img:$(TARGET_COPY_OUT_VENDOR)/firmware/hifi/hifi.img + +PRODUCT_PACKAGES += \ + dhifimesg # Build HiKey960 HDMI audio HAL. Experimental only may not work. FIXME diff --git a/vndk/Android.mk b/vndk/Android.mk deleted file mode 100644 index b6a4f74d..00000000 --- a/vndk/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -define add-vndk-sp-lib -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT)/lib/$1.so -LOCAL_MULTILIB := 32 -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := vndk-sp -include $$(BUILD_PREBUILT) - -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT)/lib64/$1.so -LOCAL_MULTILIB := 64 -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := vndk-sp -include $$(BUILD_PREBUILT) -endef - -$(foreach lib,$(VNDK_SP_LIBRARIES),\ - $(eval $(call add-vndk-sp-lib,$(lib)))) |