system/bt/vendor_libs/linux/sepolicy \
BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/generic/common/sepolicy/plat_private
+
+BOARD_USES_MINIGBM := true
+BOARD_USES_MINIGBM_INTEL := true
+BOARD_USES_GRALLOC1 := true
+BOARD_USES_IA_HWCOMPOSER := true
+TARGET_USES_HWC2 ?= true
+#BOARD_USES_VULKAN := true
+# Copyright 2018 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.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -exec rm -f {} \;)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
$(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/*/*/android.hardware.graphics.allocator@2.0-service*)
$(call add-clean-step, rm -rf $(TARGET_OUT_APPS_PRIVILEGED)/Telecom)
$(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/*/*/android.hardware.bluetooth@1.0-service* $(TARGET_OUT)/lib*/libbt-vendor.so)
$(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/lib*/hw/android.hardware.bluetooth@1.0-impl.so)
$(call add-clean-step, rm -rf $(TARGET_OUT_APPS)/AndroidTerm)
+$(call add-clean-step, rm -rf $(TARGET_OUT_ETC)/wifi)
+# Migrate to versioned VNDK directory layout
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp)
# http://www.apache.org/licenses/LICENSE-2.0
#
-export LC_CTYPE := C
-export LC_MESSAGES := C
-
ifneq ($(TARGET_NO_KERNEL),true)
ifeq ($(TARGET_PREBUILT_KERNEL),)
KERNEL_ARCH_CHANGED := $(if $(filter 0,$(shell grep -s ^$(if $(filter x86,$(TARGET_KERNEL_ARCH)),\#.)CONFIG_64BIT $(KERNEL_DOTCONFIG_FILE) | wc -l)),FORCE)
$(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFCONFIG)) $(KERNEL_ARCH_CHANGED)
$(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@
- $(hide) ln -sf ../../../../../../external $(@D)
+ $(hide) ln -sf ../../../../../../prebuilts $(@D)
$(mk_kernel) olddefconfig
BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
$(if $(wildcard $(PRODUCT_DIR)init.sh),$(PRODUCT_DIR),$(LOCAL_PATH)/)init.sh:system/etc/init.sh \
$(if $(wildcard $(PRODUCT_DIR)modules.blacklist),$(PRODUCT_DIR),$(LOCAL_PATH)/)modules.blacklist:system/etc/modules.blacklist \
$(if $(wildcard $(PRODUCT_DIR)fstab.$(TARGET_PRODUCT)),$(PRODUCT_DIR)fstab.$(TARGET_PRODUCT),$(LOCAL_PATH)/fstab.x86):root/fstab.$(TARGET_PRODUCT) \
- $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
- $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant_overlay.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
+ $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
+ $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant_overlay.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
$(if $(wildcard $(PRODUCT_DIR)excluded-input-devices.xml),$(PRODUCT_DIR),$(LOCAL_PATH)/)excluded-input-devices.xml:system/etc/excluded-input-devices.xml \
$(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/init.x86.rc):root/init.$(TARGET_PRODUCT).rc \
$(if $(wildcard $(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/ueventd.x86.rc):root/ueventd.$(TARGET_PRODUCT).rc \
device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
- frameworks/base/config/compiled-classes-phone:system/etc/compiled-classes \
frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+ frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:system/etc/permissions/android.software.activities_on_secondary_displays.xml \
+ frameworks/native/data/etc/android.software.device_admin.xml:system/etc/permissions/android.software.device_admin.xml \
frameworks/native/data/etc/android.software.freeform_window_management.xml:system/etc/permissions/android.software.freeform_window_management.xml \
+ frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml \
+ frameworks/native/data/etc/android.software.picture_in_picture.xml:system/etc/permissions/android.software.picture_in_picture.xml \
+ frameworks/native/data/etc/android.software.print.xml:system/etc/permissions/android.software.print.xml \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \
+ frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml \
$(foreach f,$(wildcard $(LOCAL_PATH)/alsa/*),$(f):$(subst $(LOCAL_PATH),system/etc,$(f))) \
$(foreach f,$(wildcard $(LOCAL_PATH)/idc/*.idc $(LOCAL_PATH)/keylayout/*.kl),$(f):$(subst $(LOCAL_PATH),system/usr,$(f)))
#
PRODUCT_PACKAGES := \
- hwcomposer.drm \
+ hwcomposer.drm hwcomposer.drm_minigbm hwcomposer.intel \
gralloc.drm \
- gralloc.gbm \
+ gralloc.gbm gralloc.minigbm gralloc.intel \
libGLES_mesa \
libtxc_dxtn \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:system/etc/permissions/android.hardware.vulkan.level.xml \
- frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:system/etc/permissions/android.hardware.vulkan.version.xml
+ frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:system/etc/permissions/android.hardware.vulkan.version.xml
function init_hal_hwcomposer()
{
# TODO
+ [ "$HWC" = "drmfb" ] && start vendor.hwcomposer-2-1.drmfb
return
}
exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
on post-fs-data
- mkdir /data/misc/wifi 0770 wifi wifi
- mkdir /data/misc/wifi/sockets 0770 wifi wifi
- mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
+ # Create the directories used by the Wireless subsystem
+ mkdir /data/vendor/wifi 0771 wifi wifi
+ mkdir /data/vendor/wifi/wpa 0770 wifi wifi
+ mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
mkdir /data/misc/dhcp 0770 dhcp dhcp
+
mkdir /data/system 0775 system system
chown wifi wifi /data/misc/wifi/wpa_supplicant.conf
setprop sys.media.vdec.drop 0
service wpa_supplicant /vendor/bin/hw/wpa_supplicant -dd \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
- -I/system/etc/wifi/wpa_supplicant_overlay.conf \
- -O/data/misc/wifi/sockets \
- -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
+ -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
+ -g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi
# group wifi inet keystore
+ interface android.hardware.wifi.supplicant@1.0::ISupplicant default
+ interface android.hardware.wifi.supplicant@1.1::ISupplicant default
class main
socket wpa_wlan0 dgram 660 wifi wifi
disabled
<hal format="hidl">
<name>android.hardware.wifi.supplicant</name>
<transport>hwbinder</transport>
- <version>1.0</version>
+ <version>1.1</version>
<interface>
<name>ISupplicant</name>
<instance>default</instance>
dest_dir=/system/lib$1/arm$1
binfmt_misc_dir=/proc/sys/fs/binfmt_misc
-urls[0]=http://t.cn/RBJ7mfG
-urls[1]=http://t.cn/RBJ7eml
-urls[2]=http://t.cn/RBJzLwu
-urls[3]=http://goo.gl/96BPKe
-urls[4]=http://goo.gl/v6c4Co
-urls[5]=http://goo.gl/CtKjxx
+urls[0]=http://t.cn/EJrmzZv
+urls[1]=http://t.cn/EJrmYMH
+urls[2]=http://t.cn/EJrmrA7
+urls[3]=http://tinyurl.com/y3nagyza
+urls[4]=http://tinyurl.com/y6azmjas
+urls[5]=http://tinyurl.com/y6g6cx27
mount_sfs()
{
}
if [ -z "$1" ]; then
- v=8_y
+ v=9_y
u=1
else
- v=8_z
+ v=9_z
u=2
fi
*/
#define LOG_TAG "libnb"
+#define LOG_NDEBUG 1
#include <dlfcn.h>
#include <cutils/log.h>
#include <cutils/properties.h>
#include "nativebridge/native_bridge.h"
-#define DBG 0
-#if DBG
-#define LOGV ALOGD
-#else
-#define LOGV ALOGV
-#endif
-
namespace android {
static void *native_handle = nullptr;
if (!native_handle) {
native_handle = dlopen(libnb, RTLD_LAZY);
if (!native_handle) {
- ALOGE("Unable to open %s", libnb);
+ ALOGE("Unable to open %s: %s", libnb, dlerror());
return nullptr;
}
}
const char *app_code_cache_dir,
const char *isa)
{
- LOGV("enter native_bridge2_initialize %s %s", app_code_cache_dir, isa);
+ ALOGV("enter native_bridge2_initialize %s %s", app_code_cache_dir, isa);
if (is_native_bridge_enabled()) {
if (NativeBridgeCallbacks *cb = get_callbacks()) {
return cb->initialize(art_cbs, app_code_cache_dir, isa);
static void *native_bridge2_loadLibrary(const char *libpath, int flag)
{
- LOGV("enter native_bridge2_loadLibrary %s", libpath);
+ ALOGV("enter native_bridge2_loadLibrary %s", libpath);
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->loadLibrary(libpath, flag) : nullptr;
}
static void *native_bridge2_getTrampoline(void *handle, const char *name,
const char* shorty, uint32_t len)
{
- LOGV("enter native_bridge2_getTrampoline %s", name);
+ ALOGV("enter native_bridge2_getTrampoline %s", name);
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->getTrampoline(handle, name, shorty, len) : nullptr;
}
static bool native_bridge2_isSupported(const char *libpath)
{
- LOGV("enter native_bridge2_isSupported %s", libpath);
+ ALOGV("enter native_bridge2_isSupported %s", libpath);
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->isSupported(libpath) : false;
}
static const struct NativeBridgeRuntimeValues *native_bridge2_getAppEnv(const char *abi)
{
- LOGV("enter native_bridge2_getAppEnv %s", abi);
+ ALOGV("enter native_bridge2_getAppEnv %s", abi);
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->getAppEnv(abi) : nullptr;
}
static bool native_bridge2_isCompatibleWith(uint32_t version)
{
static uint32_t my_version = 0;
- LOGV("enter native_bridge2_isCompatibleWith %u", version);
+ ALOGV("enter native_bridge2_isCompatibleWith %u", version);
if (my_version == 0 && is_native_bridge_enabled()) {
if (NativeBridgeCallbacks *cb = get_callbacks()) {
my_version = cb->version;
static NativeBridgeSignalHandlerFn native_bridge2_getSignalHandler(int signal)
{
- LOGV("enter native_bridge2_getSignalHandler %d", signal);
+ ALOGV("enter native_bridge2_getSignalHandler %d", signal);
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->getSignalHandler(signal) : nullptr;
}
static int native_bridge3_unloadLibrary(void *handle)
{
- LOGV("enter native_bridge3_unloadLibrary %p", handle);
+ ALOGV("enter native_bridge3_unloadLibrary %p", handle);
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->unloadLibrary(handle) : -1;
}
static const char *native_bridge3_getError()
{
- LOGV("enter native_bridge3_getError");
+ ALOGV("enter native_bridge3_getError");
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->getError() : "unknown";
}
static bool native_bridge3_isPathSupported(const char *path)
{
- LOGV("enter native_bridge3_isPathSupported %s", path);
+ ALOGV("enter native_bridge3_isPathSupported %s", path);
NativeBridgeCallbacks *cb = get_callbacks();
return cb && cb->isPathSupported(path);
}
static bool native_bridge3_initAnonymousNamespace(const char *public_ns_sonames,
const char *anon_ns_library_path)
{
- LOGV("enter native_bridge3_initAnonymousNamespace %s, %s", public_ns_sonames, anon_ns_library_path);
+ ALOGV("enter native_bridge3_initAnonymousNamespace %s, %s", public_ns_sonames, anon_ns_library_path);
NativeBridgeCallbacks *cb = get_callbacks();
return cb && cb->initAnonymousNamespace(public_ns_sonames, anon_ns_library_path);
}
const char *permitted_when_isolated_path,
native_bridge_namespace_t *parent_ns)
{
- LOGV("enter native_bridge3_createNamespace %s, %s, %s, %s", name, ld_library_path, default_library_path, permitted_when_isolated_path);
+ ALOGV("enter native_bridge3_createNamespace %s, %s, %s, %s", name, ld_library_path, default_library_path, permitted_when_isolated_path);
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->createNamespace(name, ld_library_path, default_library_path, type, permitted_when_isolated_path, parent_ns) : nullptr;
}
native_bridge_namespace_t *to,
const char *shared_libs_soname)
{
- LOGV("enter native_bridge3_linkNamespaces %s", shared_libs_soname);
+ ALOGV("enter native_bridge3_linkNamespaces %s", shared_libs_soname);
NativeBridgeCallbacks *cb = get_callbacks();
return cb && cb->linkNamespaces(from, to, shared_libs_soname);
}
int flag,
native_bridge_namespace_t *ns)
{
- LOGV("enter native_bridge3_loadLibraryExt %s, %d, %p", libpath, flag, ns);
+ ALOGV("enter native_bridge3_loadLibraryExt %s, %d, %p", libpath, flag, ns);
NativeBridgeCallbacks *cb = get_callbacks();
void *result = cb ? cb->loadLibraryExt(libpath, flag, ns) : nullptr;
// void *result = cb ? cb->loadLibrary(libpath, flag) : nullptr;
- LOGV("native_bridge3_loadLibraryExt: %p", result);
+ ALOGV("native_bridge3_loadLibraryExt: %p", result);
return result;
}
static native_bridge_namespace_t *native_bridge4_getVendorNamespace()
{
- LOGV("enter native_bridge4_getVendorNamespace");
+ ALOGV("enter native_bridge4_getVendorNamespace");
NativeBridgeCallbacks *cb = get_callbacks();
return cb ? cb->getVendorNamespace() : nullptr;
}
--- /dev/null
+###############################################################################
+# Debug options
+NFC_DEBUG_ENABLED=0
+
+###############################################################################
+# File used for NFA storage
+NFA_STORAGE="/data/nfc"
+PRESERVE_STORAGE=0x01
+
+###############################################################################
+# When screen is turned off, specify the desired power state of the controller.
+# 0: power-off-sleep state; DEFAULT
+# 1: full-power state
+# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
+SCREEN_OFF_POWER_STATE=1
+
+###############################################################################
+# Default poll duration (in ms)
+# The defualt is 500ms if not set (see nfc_target.h)
+#NFA_DM_DISC_DURATION_POLL=333
+
+###############################################################################
+# Force tag polling for the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
+# NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 |
+# NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO |
+# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE.
+#
+# Notable bits:
+# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */
+# NFA_TECHNOLOGY_MASK_B 0x02 /* NFC Technology B */
+# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */
+# NFA_TECHNOLOGY_MASK_ISO15693 0x08 /* Proprietary Technology */
+# NFA_TECHNOLOGY_MASK_KOVIO 0x20 /* Proprietary Technology */
+# NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */
+# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */
+#POLLING_TECH_MASK=0xEF
+
+###############################################################################
+# Force P2P to only listen for the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
+# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE
+#
+# Notable bits:
+# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */
+# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */
+# NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */
+# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */
+#P2P_LISTEN_TECH_MASK=0xC5
+
+###############################################################################
+# Force UICC to only listen to the following technology(s).
+# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
+# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
+UICC_LISTEN_TECH_MASK=0x07
+
+###############################################################################
+# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
+# The value is set to 3 by default as it assumes we will discover 0xF2,
+# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced
+# so that the stack will not wait any longer than necessary.
+# Maximum EE supported number
+# NXP PN547C2 0x02
+# NXP PN65T 0x03
+# NXP PN548C2 0x02
+# NXP PN66T 0x03
+NFA_MAX_EE_SUPPORTED=0x02
+
+###############################################################################
+# AID for Empty Select command
+# If specified, this AID will be substituted when an Empty SELECT command is
+# detected. The first byte is the length of the AID. Maximum length is 16.
+AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
+
+###############################################################################
+# AID_MATCHING constants
+# AID_MATCHING_EXACT_ONLY 0x00
+# AID_MATCHING_EXACT_OR_PREFIX 0x01
+# AID_MATCHING_PREFIX_ONLY 0x02
+AID_MATCHING_MODE=0x01
# HWComposer HAL
PRODUCT_PACKAGES += \
- android.hardware.graphics.composer@2.1-impl
+ android.hardware.graphics.composer@2.1-impl \
+ android.hardware.graphics.composer@2.1-service.drmfb
# Audio HAL
PRODUCT_PACKAGES += \
+++ /dev/null
-ifneq ($(filter generic_%,$(TARGET_DEVICE)),)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/vndk-sp-libs.mk
-
-define define-vndk-sp-lib
-include $$(CLEAR_VARS)
-LOCAL_MODULE := $1.vndk-sp-gen
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,,)/$1.so
-LOCAL_STRIP_MODULE := false
-LOCAL_MULTILIB := first
-LOCAL_MODULE_TAGS := optional
-LOCAL_INSTALLED_MODULE_STEM := $1.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_RELATIVE_PATH := vndk-sp
-include $$(BUILD_PREBUILT)
-
-ifneq ($$(TARGET_2ND_ARCH),)
-ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true)
-include $$(CLEAR_VARS)
-LOCAL_MODULE := $1.vndk-sp-gen
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,$$(TARGET_2ND_ARCH_VAR_PREFIX),)/$1.so
-LOCAL_STRIP_MODULE := false
-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)
-endif # TARGET_TRANSLATE_2ND_ARCH is not true
-endif # TARGET_2ND_ARCH is not empty
-endef
-
-$(foreach lib,$(VNDK_SP_LIBRARIES),\
- $(eval $(call define-vndk-sp-lib,$(lib))))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vndk-sp
-LOCAL_MODULE_OWNER := google
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES))
-include $(BUILD_PHONY_PACKAGE)
-
-endif # TARGET_DEVICE is generic_*
+++ /dev/null
-ifndef BOARD_VNDK_VERSION
-VNDK_SP_LIBRARIES += \
- android.hardware.graphics.allocator@2.0 \
- android.hardware.graphics.mapper@2.0 \
- android.hardware.graphics.common@1.0 \
- android.hardware.renderscript@1.0 \
- android.hidl.memory@1.0 \
- libbacktrace \
- libbase \
- libc++ \
- libcutils \
- libRSCpuRef \
- libRSDriver \
- libRS_internal \
- libbcinfo \
- libblas \
- libcompiler_rt \
- libft2 \
- libpng \
- libhardware \
- libhwbinder \
- libion \
- liblzma \
- libunwind \
- libutils \
- libhidlbase \
- libhidlmemory \
- libhidltransport \
- libz \
-
-endif
OSDN Git Service
