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

Commit 6f973a49 authored by Ronish Kalia's avatar Ronish Kalia Committed by Android (Google) Code Review
Browse files

Merge "[DON'T BLOCK] Test ownership migration rules" into main

parents 7dba7b4b b5dd44bc

camera/Android.bp

+10 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_camera_framework",

    default_applicable_licenses: ["frameworks_av_camera_license"],

}
@@ -65,6 +66,7 @@ cc_library_headers { 
    name: "camera_headers",

    export_include_dirs: ["include"],

}



cc_library {

    name: "libcamera_client",
@@ -121,9 +123,13 @@ cc_library { 
    ],

    export_include_dirs: [

        "include",

         "include/camera"

        "include/camera",

    ],

    export_shared_lib_headers: [

        "libcamera_metadata",

        "libnativewindow",

        "libgui",

    ],

    export_shared_lib_headers: ["libcamera_metadata", "libnativewindow", "libgui"],



    cflags: [

        "-Werror",
@@ -153,7 +159,7 @@ cc_library_host_static { 


    export_include_dirs: [

        "include",

        "include/camera"

        "include/camera",

    ],

}

camera/cameraserver/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_camera_framework",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_av_camera_license"

camera/ndk/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
// frameworks/av/include.



package {

    default_team: "trendy_team_camera_framework",

    default_applicable_licenses: ["frameworks_av_camera_ndk_license"],

}

camera/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_camera_framework",

    // See: http://go/android-license-faq

    default_applicable_licenses: [

        "frameworks_av_camera_license",

camera/tests/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */

package {

    default_team: "trendy_team_camera_framework",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_av_camera_license"