commit 6e01307bcf08d05ac8773e393ea2964c43f21f42
author Greg Hackmann <ghackmann@google.com> Wed Feb 01 04:48:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 01 04:48:00 2017 +0000
tree 77a4add4537484b4fd6f3ff3e475e7ae668433e0
parent 3b52eb39428769205898ca868875be535576b5b1
parent f6c3ea74645c319bf2aaf331e0d7e8ff896273d4

libadf: adf_test: fix clang + kati build am: 09f8f986a9 am: 33d2307567
am: 8b680f9c3f

Change-Id: I6895bc1b5eb671d368ecf4ec856a43d3ad32ef7a

adf/libadf/Android.bp

diff --git a/adf/libadf/Android.bp b/adf/libadf/Android.bp
index 2b5461e..1a81a49 100644
--- a/adf/libadf/Android.bp
+++ b/adf/libadf/Android.bp
@@ -19,3 +19,5 @@
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
 }
+
+subdirs = ["tests"]

adf/libadf/tests/adf_test.cpp

diff --git a/adf/libadf/tests/adf_test.cpp b/adf/libadf/tests/adf_test.cpp
index 01b2785..eaa9342 100644
--- a/adf/libadf/tests/adf_test.cpp
+++ b/adf/libadf/tests/adf_test.cpp
@@ -149,11 +149,13 @@
     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,