diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp index 6d2ee7b5..9215dcf8 100644 --- a/fuzzer/Android.bp +++ b/fuzzer/Android.bp @@ -35,7 +35,6 @@ cc_defaults { "liblog", "libbase", "libutils", - "wv_media_drm_flags_c_lib", ], include_dirs: [ "vendor/widevine/libwvdrmengine/cdm/core/include", diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp index a8fa8fc2..46f96b3e 100644 --- a/libwvdrmengine/Android.bp +++ b/libwvdrmengine/Android.bp @@ -153,7 +153,6 @@ cc_binary { shared_libs: [ "libbinder_ndk", - "wv_media_drm_flags_c_lib", ], init_rc: ["src/android.hardware.drm-service.widevine.rc"], @@ -178,10 +177,7 @@ cc_binary { "frameworks/native/libs/binder/include", ], - shared_libs: [ - "libbinder_ndk", - "wv_media_drm_flags_c_lib", - ], + shared_libs: ["libbinder_ndk"], init_rc: ["src/android.hardware.drm-service-lazy.widevine.rc"], vintf_fragments: ["manifest_android.hardware.drm-service-lazy.widevine.xml"], @@ -227,7 +223,6 @@ cc_library_static { "libbinder_ndk", "libcrypto", "liblog", - "wv_media_drm_flags_c_lib", ], static_libs: [ @@ -301,7 +296,6 @@ cc_library { "libcrypto", "libdl", "liblog", - "wv_media_drm_flags_c_lib", ], header_libs: ["libstagefright_foundation_headers"], @@ -334,9 +328,6 @@ cc_fuzz { "service_fuzzer_defaults", "fuzzer_disable_leaks", ], - shared_libs: [ - "wv_media_drm_flags_c_lib", - ], static_libs: [ "libbase", "libbinder_random_parcel", diff --git a/libwvdrmengine/aconfig/Android.bp b/libwvdrmengine/aconfig/Android.bp deleted file mode 100644 index d1ae5e7a..00000000 --- a/libwvdrmengine/aconfig/Android.bp +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (C) 2023 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. - -aconfig_declarations { - name: "wv_media_drm_flags", - package: "com.android.mediadrm.widevine.flags", - srcs: [ - "wv_media_drm_flags.aconfig", - ], -} - -cc_aconfig_library { - name: "wv_media_drm_flags_c_lib", - aconfig_declarations: "wv_media_drm_flags", - vendor_available: true, - min_sdk_version: "34", -} diff --git a/libwvdrmengine/aconfig/wv_media_drm_flags.aconfig b/libwvdrmengine/aconfig/wv_media_drm_flags.aconfig deleted file mode 100644 index 646b358f..00000000 --- a/libwvdrmengine/aconfig/wv_media_drm_flags.aconfig +++ /dev/null @@ -1,8 +0,0 @@ -package: "com.android.mediadrm.widevine.flags" - -flag { - name: "update_cdm_version_to_18_0_2" - namespace: "media_drm" - description: "Update CDM version to 18.0.2" - bug: "311951236" -} diff --git a/libwvdrmengine/cdm/include/wv_android_constants.h b/libwvdrmengine/cdm/include/wv_android_constants.h index bd49ea1b..caf4a246 100644 --- a/libwvdrmengine/cdm/include/wv_android_constants.h +++ b/libwvdrmengine/cdm/include/wv_android_constants.h @@ -11,8 +11,7 @@ namespace wvcdm { // Note: If you change this, make sure you also change // https://developers.google.com/widevine/drm/client/oemcrypto/compatibility -static const std::string kWVAndroidCdmVersion_18_0_1 = "18.0.1"; -static const std::string kWVAndroidCdmVersion_18_0_2 = "18.0.2"; +static const std::string kWVAndroidCdmVersion = "18.0.0"; } // namespace wvcdm diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp index 04afdd7e..339536ff 100644 --- a/libwvdrmengine/cdm/src/properties_android.cpp +++ b/libwvdrmengine/cdm/src/properties_android.cpp @@ -12,15 +12,11 @@ #include #include -#include - #include "log.h" #include "wv_android_constants.h" #include "widevine_apex_info.h" using namespace android::sysprop; - -namespace mediadrm_flags = com::android::mediadrm::widevine::flags; namespace { const char kBasePathPrefix[] = "/data/vendor/mediadrm/IDM"; @@ -150,11 +146,7 @@ bool Properties::GetWVCdmVersion(std::string* version) { } #endif - if (mediadrm_flags::update_cdm_version_to_18_0_2()) { - *version = kWVAndroidCdmVersion_18_0_2 + apex_version; - } else { - *version = kWVAndroidCdmVersion_18_0_1 + apex_version; - } + *version = kWVAndroidCdmVersion + apex_version; return true; } diff --git a/libwvdrmengine/cdm/test/integration-test.mk b/libwvdrmengine/cdm/test/integration-test.mk index 35cc4107..811d47fd 100644 --- a/libwvdrmengine/cdm/test/integration-test.mk +++ b/libwvdrmengine/cdm/test/integration-test.mk @@ -75,7 +75,6 @@ LOCAL_SHARED_LIBRARIES := \ libssl \ libstagefright_foundation \ libutils \ - wv_media_drm_flags_c_lib \ LOCAL_CFLAGS += -DUNIT_TEST diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index f1ab4070..fa497b45 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -42,7 +42,6 @@ LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ libutils \ libwvaidl \ - wv_media_drm_flags_c_lib \ LOCAL_HEADER_LIBRARIES := \ libstagefright_headers \ diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 7bfc43bf..baf4a85e 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -41,7 +41,6 @@ LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ libutils \ libwvaidl \ - wv_media_drm_flags_c_lib \ LOCAL_HEADER_LIBRARIES := \ libstagefright_headers \ diff --git a/libwvdrmengine/test/Android.bp b/libwvdrmengine/test/Android.bp index 5a4f3d64..e8f578de 100644 --- a/libwvdrmengine/test/Android.bp +++ b/libwvdrmengine/test/Android.bp @@ -65,7 +65,6 @@ cc_test { "libdl", "liblog", "libssl", - "wv_media_drm_flags_c_lib", ], cflags: [ "-Wall",