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

Commit 09f8f986 authored by Greg Hackmann's avatar Greg Hackmann
Browse files

libadf: adf_test: fix clang + kati build 



kati needs us to add "tests" as a subdir of the libadf Android.bp.
clang also requires an explicit definition of AdfTest::dev_id where
g++ does not.

Test: mmm system/core/adf/libadf
Test: /data/nativetest64/adf-unit-tests/adf-unit-tests (on Nexus 9)
Change-Id: I1fc371af1b5b115f088edd963a87e6647a52882b
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
parent 13c15e05

adf/libadf/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -19,3 +19,5 @@ cc_library_static { 
    local_include_dirs: ["include"],

    export_include_dirs: ["include"],

}



subdirs = ["tests"]

adf/libadf/tests/adf_test.cpp

+3 −1
Original line number Diff line number Diff line
@@ -149,11 +149,13 @@ protected: 
    int eng;



private:

    const static adf_id_t dev_id = 0;

    const static adf_id_t dev_id;

    const static __u32 fmt8888[];

    const static size_t n_fmt8888;

};



const adf_id_t AdfTest::dev_id = 0;



const __u32 AdfTest::fmt8888[] = {

   DRM_FORMAT_XRGB8888,

   DRM_FORMAT_XBGR8888,