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

Commit 3ed04cd3 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in hardware/interfaces" 

am: 85bb01dd

Change-Id: I9169eb99a256f3a1db9e6f82e11fd96228d9558a
parents 4aceac6a 85bb01dd

audio/common/2.0/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


cc_library_shared {

    name: "android.hardware.audio.common@2.0-util",

    defaults: ["hidl_defaults"],

    vendor_available: true,

    srcs: [

        "EffectMap.cpp",

drm/1.0/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


cc_test {

    name: "VtsHalDrmV1_0TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "drm_hal_clearkey_test.cpp",

        "drm_hal_vendor_test.cpp",

drm/1.0/vts/functional/drm_hal_clearkey_test.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1063,8 +1063,6 @@ void DrmHalClearkeyDecryptTest::aes_cbc_decrypt(uint8_t* dest, uint8_t* src, 
    AES_set_encrypt_key(&key[0], 128, &decryptionKey);



    size_t offset = 0;

    size_t num = 0;

    size_t ecount_buf = 0;

    for (size_t i = 0; i < subSamples.size(); i++) {

        memcpy(dest + offset, src + offset, subSamples[i].numBytesOfClearData);

        offset += subSamples[i].numBytesOfClearData;
@@ -1105,7 +1103,6 @@ TEST_F(DrmHalClearkeyDecryptTest, ClearSegmentTest) { 
    Status status = cryptoPlugin->setMediaDrmSession(sessionId);

    EXPECT_EQ(Status::OK, status);



    const bool kNotSecure = false;

    uint32_t byteCount = decrypt(Mode::UNENCRYPTED, &iv[0], subSamples,

            noPattern, Status::OK);

    EXPECT_EQ(kByteCount, byteCount);
@@ -1132,7 +1129,6 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTest) { 
    Status status = cryptoPlugin->setMediaDrmSession(sessionId);

    EXPECT_EQ(Status::OK, status);



    const bool kNotSecure = false;

    uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples,

            noPattern, Status::OK);

    EXPECT_EQ(kClearBytes + kEncryptedBytes, byteCount);
@@ -1153,7 +1149,6 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTestNoKeys) { 
    Status status = cryptoPlugin->setMediaDrmSession(sessionId);

    EXPECT_EQ(Status::OK, status);



    const bool kNotSecure = false;

    uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples,

            noPattern, Status::ERROR_DRM_NO_LICENSE);

    EXPECT_EQ(0u, byteCount);

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1406,8 +1406,6 @@ void DrmHalVendorDecryptTest::aes_cbc_decrypt(uint8_t* dest, uint8_t* src, 
    AES_set_encrypt_key(&key[0], 128, &decryptionKey);



    size_t offset = 0;

    size_t num = 0;

    size_t ecount_buf = 0;

    for (size_t i = 0; i < subSamples.size(); i++) {

        const SubSample& subSample = subSamples[i];

minijail/Android.bp

+1 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libhwminijail",

    defaults: ["hidl_defaults"],

    vendor: true,

    export_include_dirs: ["include"],