Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a0e3988 authored by Sundong Ahn's avatar Sundong Ahn Committed by android-build-merger
Browse files

Merge "Check the media.settings.xml property" am: 646a332a 

am: 5369de1f

Change-Id: I1ae0766da45a61c777f7772193171180f15c9ecb
parents 5e12c916 5369de1f

media/libmedia/xsd/vts/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ cc_test { 
        "libxml2",

    ],

    shared_libs: [

        "libbase",

        "liblog",

    ],

    cflags: [

media/libmedia/xsd/vts/ValidateMediaProfiles.cpp

+10 −2
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



#include <string>



#include <android-base/file.h>

#include <android-base/properties.h>

#include "utility/ValidateXml.h"



TEST(CheckConfig, mediaProfilesValidation) {
@@ -21,8 +25,12 @@ TEST(CheckConfig, mediaProfilesValidation) { 
                   "Verify that the media profiles file "

                   "is valid according to the schema");



    const char* location = "/vendor/etc";

    std::string mediaSettingsPath = android::base::GetProperty("media.settings.xml", "");

    if (mediaSettingsPath.empty()) {

        mediaSettingsPath.assign("/vendor/etc/media_profiles_V1_0.xml");

    }



    EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS("media_profiles_V1_0.xml", {location},

    EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS(android::base::Basename(mediaSettingsPath).c_str(),

                                            {android::base::Dirname(mediaSettingsPath).c_str()},

                                            "/data/local/tmp/media_profiles.xsd");

}