ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libadf: adf_test: fix clang + kati build

Browse source 
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: Greg Hackmann <ghackmann@google.com>
This commit is contained in:
Greg Hackmann 2017-01-27 12:58:01 -08:00
parent 13c15e05d0
commit 09f8f986a9
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adf/libadf/Android.bp
View file

@ -19,3 +19,5 @@ cc_library_static {
local_include_dirs: ["include"], local_include_dirs: ["include"],
export_include_dirs: ["include"], export_include_dirs: ["include"],
} }
subdirs = ["tests"]

4
adf/libadf/tests/adf_test.cpp
View file

@ -149,11 +149,13 @@ protected:
int eng; int eng;
private: private:
const static adf_id_t dev_id = 0; const static adf_id_t dev_id;
const static __u32 fmt8888[]; const static __u32 fmt8888[];
const static size_t n_fmt8888; const static size_t n_fmt8888;
}; };
const adf_id_t AdfTest::dev_id = 0;
const __u32 AdfTest::fmt8888[] = { const __u32 AdfTest::fmt8888[] = {
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
DRM_FORMAT_XBGR8888, DRM_FORMAT_XBGR8888,