Merge Android Pie into master
Bug: 112104996
Change-Id: I2d009e7c4f1ee466a475faf36d6a09b06399cd0c
diff --git a/Android.bp b/Android.bp
index b7a4c0c..13bbf9f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -149,3 +149,22 @@
"libjpeg",
],
}
+
+cc_binary_host {
+ name: "dng_validate_host",
+ defaults: ["libdng_sdk-defaults"],
+ srcs: ["source/dng_validate.cpp"],
+
+ cflags: ["-DqDNGValidate=1"],
+
+ shared_libs: [
+ "libz",
+ "libjpeg",
+ ],
+
+ target: {
+ darwin: {
+ enabled: false, // b/67474260
+ },
+ },
+}