Merge "C2 VTS: Update SetUp() to reduce code duplications"
diff --git a/apex/Android.bp b/apex/Android.bp
index dabf4c2..5a88d24 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -24,7 +24,7 @@
apex_defaults {
name: "com.android.media-defaults",
updatable: true,
- java_libs: ["updatable-media"],
+ bootclasspath_fragments: ["com.android.media-bootclasspath-fragment"],
multilib: {
first: {
// Extractor process runs only with the primary ABI.
@@ -74,6 +74,7 @@
manifest: "manifest.json",
defaults: ["com.android.media-defaults"],
prebuilts: [
+ "current_sdkinfo",
"media-linker-config",
],
}
@@ -84,6 +85,13 @@
installable: false,
}
+// Encapsulate the contributions made by the com.android.media to the bootclasspath.
+bootclasspath_fragment {
+ name: "com.android.media-bootclasspath-fragment",
+ contents: ["updatable-media"],
+ apex_available: ["com.android.media"],
+}
+
filegroup {
name: "com.android.media-androidManifest",
srcs: ["AndroidManifest-media.xml"],
diff --git a/apex/OWNERS b/apex/OWNERS
index 5587f5f..a60d04b 100644
--- a/apex/OWNERS
+++ b/apex/OWNERS
@@ -4,3 +4,6 @@
lajos@google.com
marcone@google.com
wjia@google.com
+
+include platform/packages/modules/common:/MODULES_OWNERS
+
diff --git a/media/libeffects/visualizer/Android.bp b/media/libeffects/visualizer/Android.bp
new file mode 100644
index 0000000..335251a
--- /dev/null
+++ b/media/libeffects/visualizer/Android.bp
@@ -0,0 +1,41 @@
+package {
+ default_applicable_licenses: ["frameworks_av_media_libeffects_visualizer_license"],
+}
+
+// See: http://go/android-license-faq
+license {
+ name: "frameworks_av_media_libeffects_visualizer_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
+// Visualizer library
+cc_library_shared {
+ name: "libvisualizer",
+ vendor: true,
+ srcs: ["EffectVisualizer.cpp"],
+ cflags: [
+ "-O2",
+ "-fvisibility=hidden",
+ "-Wall",
+ "-Werror",
+ "-DBUILD_FLOAT",
+ "-DSUPPORT_MC",
+ ],
+ shared_libs: [
+ "libcutils",
+ "liblog",
+ "libdl",
+ ],
+ relative_install_path: "soundfx",
+ header_libs: [
+ "libhardware_headers",
+ "libaudioeffects",
+ "libaudioutils_headers",
+ ],
+}
diff --git a/media/libeffects/visualizer/Android.mk b/media/libeffects/visualizer/Android.mk
deleted file mode 100644
index 68c7cf2..0000000
--- a/media/libeffects/visualizer/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-# Visualizer library
-include $(CLEAR_VARS)
-
-LOCAL_VENDOR_MODULE := true
-LOCAL_SRC_FILES:= \
- EffectVisualizer.cpp
-
-LOCAL_CFLAGS+= -O2 -fvisibility=hidden
-LOCAL_CFLAGS += -Wall -Werror
-LOCAL_CFLAGS += -DBUILD_FLOAT -DSUPPORT_MC
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- liblog \
- libdl
-
-LOCAL_MODULE_RELATIVE_PATH := soundfx
-LOCAL_MODULE:= libvisualizer
-LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS:= notice
-LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE
-
-LOCAL_C_INCLUDES := \
- $(call include-path-for, audio-effects) \
- $(call include-path-for, audio-utils)
-
-
-LOCAL_HEADER_LIBRARIES += libhardware_headers
-include $(BUILD_SHARED_LIBRARY)
diff --git a/services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py b/services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py
index b5885c0..76c35c1 100755
--- a/services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py
+++ b/services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py
@@ -200,6 +200,11 @@
#
ignored_values = ['CNT', 'MAX', 'ALL', 'NONE']
+ #
+ # Reaching 32 bit limit for inclusive criterion out devices: removing
+ #
+ ignored_output_device_values = ['BleSpeaker', 'BleHeadset']
+
criteria_pattern = re.compile(
r"\s*V\((?P<type>(?:"+'|'.join(criterion_mapping_table.keys()) + "))_" \
r"(?P<literal>(?!" + '|'.join(ignored_values) + ")\w*)\s*,\s*" \
@@ -235,7 +240,9 @@
if criterion_name == "OutputDevicesMaskType":
if criterion_literal == "Default":
criterion_numerical_value = str(int("0x40000000", 0))
-
+ if criterion_literal in ignored_output_device_values:
+ logging.info("OutputDevicesMaskType skipping {}".format(criterion_literal))
+ continue
try:
string_int = int(criterion_numerical_value, 0)
except ValueError: