diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..65c7c51
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,149 @@
+cc_defaults {
+    name: "libdng_sdk-defaults",
+    srcs: [
+        "source/dng_1d_function.cpp",
+        "source/dng_1d_table.cpp",
+        "source/dng_abort_sniffer.cpp",
+        "source/dng_area_task.cpp",
+        "source/dng_bad_pixels.cpp",
+        "source/dng_bottlenecks.cpp",
+        "source/dng_camera_profile.cpp",
+        "source/dng_color_space.cpp",
+        "source/dng_color_spec.cpp",
+        "source/dng_date_time.cpp",
+        "source/dng_exceptions.cpp",
+        "source/dng_exif.cpp",
+        "source/dng_file_stream.cpp",
+        "source/dng_filter_task.cpp",
+        "source/dng_fingerprint.cpp",
+        "source/dng_gain_map.cpp",
+        "source/dng_globals.cpp",
+        "source/dng_host.cpp",
+        "source/dng_hue_sat_map.cpp",
+        "source/dng_ifd.cpp",
+        "source/dng_image.cpp",
+        "source/dng_image_writer.cpp",
+        "source/dng_info.cpp",
+        "source/dng_iptc.cpp",
+        "source/dng_jpeg_image.cpp",
+        "source/dng_jpeg_memory_source.cpp",
+        "source/dng_lens_correction.cpp",
+        "source/dng_linearization_info.cpp",
+        "source/dng_lossless_jpeg.cpp",
+        "source/dng_matrix.cpp",
+        "source/dng_memory.cpp",
+        "source/dng_memory_stream.cpp",
+        "source/dng_misc_opcodes.cpp",
+        "source/dng_mosaic_info.cpp",
+        "source/dng_mutex.cpp",
+        "source/dng_negative.cpp",
+        "source/dng_opcode_list.cpp",
+        "source/dng_opcodes.cpp",
+        "source/dng_orientation.cpp",
+        "source/dng_parse_utils.cpp",
+        "source/dng_pixel_buffer.cpp",
+        "source/dng_point.cpp",
+        "source/dng_preview.cpp",
+        "source/dng_pthread.cpp",
+        "source/dng_rational.cpp",
+        "source/dng_read_image.cpp",
+        "source/dng_rect.cpp",
+        "source/dng_ref_counted_block.cpp",
+        "source/dng_reference.cpp",
+        "source/dng_render.cpp",
+        "source/dng_resample.cpp",
+        "source/dng_safe_arithmetic.cpp",
+        "source/dng_shared.cpp",
+        "source/dng_simple_image.cpp",
+        "source/dng_spline.cpp",
+        "source/dng_stream.cpp",
+        "source/dng_string.cpp",
+        "source/dng_string_list.cpp",
+        "source/dng_tag_types.cpp",
+        "source/dng_temperature.cpp",
+        "source/dng_tile_iterator.cpp",
+        "source/dng_tone_curve.cpp",
+        "source/dng_utils.cpp",
+        "source/dng_xy_coord.cpp",
+        "source/dng_xmp.cpp",
+    ],
+    cflags: [
+        "-DUNIX_ENV=1",
+        "-DqDNGBigEndian=0",
+        "-DqDNGThreadSafe=1",
+        "-DqDNGUseLibJPEG=1",
+        "-DqDNGUseXMP=0",
+        "-DqDNGValidateTarget=1",
+        "-DqAndroid=1",
+        "-Wsign-compare",
+        "-Wno-reorder",
+        "-Wframe-larger-than=20000",
+
+        // Ignore unused parameters.
+        "-Wno-unused-parameter",
+
+        // Some integral return types are annotated with "const."
+        "-Wno-ignored-qualifiers",
+    ],
+
+    rtti: true,
+    cppflags: ["-fexceptions"],
+
+    clang: true,
+    sanitize: {
+        misc_undefined: [
+            "unsigned-integer-overflow",
+            "signed-integer-overflow",
+        ],
+    },
+}
+
+cc_library{
+    name: "libdng_sdk",
+    defaults: ["libdng_sdk-defaults"],
+
+    cflags: ["-DqDNGValidate=0"],
+
+    shared_libs: [
+        "libz",
+        "libjpeg",
+    ],
+
+    export_include_dirs: ["source"],
+}
+
+// dng sdk validating version static library
+// This version will print out validation warnings/errors to stderr
+// and is built against the NDK for use with CTS
+// ========================================================
+
+cc_library_static {
+    name: "libdng_sdk_validate",
+    defaults: ["libdng_sdk-defaults"],
+
+    cflags: ["-DqDNGValidate=1"],
+
+    static_libs: ["libjpeg_static_ndk"],
+    shared_libs: ["libz"],
+
+    export_include_dirs: ["source"],
+
+    sdk_version: "24",
+    stl: "c++_static",
+}
+
+// dng sdk unittests for target
+// ========================================================
+
+cc_binary {
+    name: "dng_validate",
+    defaults: ["libdng_sdk-defaults"],
+    srcs: ["source/dng_validate.cpp"],
+
+    cflags: ["-DqDNGValidate=1"],
+
+    shared_libs: [
+        "libz",
+        "libjpeg",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 475dbcd..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,153 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# dng sdk shared library for target
-# ========================================================
-
-include $(CLEAR_VARS)
-
-dng_sdk_files := \
-    source/dng_1d_function.cpp \
-    source/dng_1d_table.cpp \
-    source/dng_abort_sniffer.cpp \
-    source/dng_area_task.cpp \
-    source/dng_bad_pixels.cpp \
-    source/dng_bottlenecks.cpp \
-    source/dng_camera_profile.cpp \
-    source/dng_color_space.cpp \
-    source/dng_color_spec.cpp \
-    source/dng_date_time.cpp \
-    source/dng_exceptions.cpp \
-    source/dng_exif.cpp \
-    source/dng_file_stream.cpp \
-    source/dng_filter_task.cpp \
-    source/dng_fingerprint.cpp \
-    source/dng_gain_map.cpp \
-    source/dng_globals.cpp \
-    source/dng_host.cpp \
-    source/dng_hue_sat_map.cpp \
-    source/dng_ifd.cpp \
-    source/dng_image.cpp \
-    source/dng_image_writer.cpp \
-    source/dng_info.cpp \
-    source/dng_iptc.cpp \
-    source/dng_jpeg_image.cpp \
-    source/dng_jpeg_memory_source.cpp \
-    source/dng_lens_correction.cpp \
-    source/dng_linearization_info.cpp \
-    source/dng_lossless_jpeg.cpp \
-    source/dng_matrix.cpp \
-    source/dng_memory.cpp \
-    source/dng_memory_stream.cpp \
-    source/dng_misc_opcodes.cpp \
-    source/dng_mosaic_info.cpp \
-    source/dng_mutex.cpp \
-    source/dng_negative.cpp \
-    source/dng_opcode_list.cpp \
-    source/dng_opcodes.cpp \
-    source/dng_orientation.cpp \
-    source/dng_parse_utils.cpp \
-    source/dng_pixel_buffer.cpp \
-    source/dng_point.cpp \
-    source/dng_preview.cpp \
-    source/dng_pthread.cpp \
-    source/dng_rational.cpp \
-    source/dng_read_image.cpp \
-    source/dng_rect.cpp \
-    source/dng_ref_counted_block.cpp \
-    source/dng_reference.cpp \
-    source/dng_render.cpp \
-    source/dng_resample.cpp \
-    source/dng_safe_arithmetic.cpp \
-    source/dng_shared.cpp \
-    source/dng_simple_image.cpp \
-    source/dng_spline.cpp \
-    source/dng_stream.cpp \
-    source/dng_string.cpp \
-    source/dng_string_list.cpp \
-    source/dng_tag_types.cpp \
-    source/dng_temperature.cpp \
-    source/dng_tile_iterator.cpp \
-    source/dng_tone_curve.cpp \
-    source/dng_utils.cpp \
-    source/dng_xy_coord.cpp \
-    source/dng_xmp.cpp
-
-LOCAL_MODULE := libdng_sdk
-LOCAL_SRC_FILES := $(dng_sdk_files)
-
-LOCAL_CFLAGS := \
-    -DUNIX_ENV=1 -DqDNGBigEndian=0 -DqDNGThreadSafe=1 \
-    -DqDNGUseLibJPEG=1 -DqDNGUseXMP=0 -DqDNGValidate=0 \
-    -DqDNGValidateTarget=1 -DqAndroid=1 \
-    -Wsign-compare -Wno-reorder -Wframe-larger-than=20000
-
-LOCAL_CPPFLAGS := -frtti -fexceptions
-
-# Ignore unused parameters.
-LOCAL_CFLAGS += -Wno-unused-parameter
-# Some integral return types are annotated with "const."
-LOCAL_CFLAGS += -Wno-ignored-qualifiers
-
-LOCAL_CLANG := true
-LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow
-
-LOCAL_SHARED_LIBRARIES := libz libjpeg
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/source
-
-include $(BUILD_SHARED_LIBRARY)
-
-# dng sdk validating version static library
-# This version will print out validation warnings/errors to stderr
-# and is built against the NDK for use with CTS
-# ========================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libdng_sdk_validate
-LOCAL_SRC_FILES := $(dng_sdk_files)
-
-LOCAL_CFLAGS := \
-    -DUNIX_ENV=1 -DqDNGBigEndian=0 -DqDNGThreadSafe=1 \
-    -DqDNGUseLibJPEG=1 -DqDNGUseXMP=0 -DqDNGValidate=1 \
-    -DqDNGValidateTarget=1 -DqAndroid=1 \
-    -Wsign-compare -Wno-reorder -Wframe-larger-than=20000
-
-LOCAL_CPPFLAGS := -frtti -fexceptions
-
-# Ignore unused parameters.
-LOCAL_CFLAGS += -Wno-unused-parameter
-# Some integral return types are annotated with "const."
-LOCAL_CFLAGS += -Wno-ignored-qualifiers
-
-LOCAL_CLANG := true
-LOCAL_SANITIZE := unsigned-integer-overflow signed-integer-overflow
-
-LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk
-LOCAL_SHARED_LIBRARIES := libz
-
-LOCAL_CPP_FEATURES := rtti exceptions
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/source
-
-# NDK build, shared C++ runtime
-LOCAL_SDK_VERSION := 24
-LOCAL_NDK_STL_VARIANT := c++_shared
-
-include $(BUILD_STATIC_LIBRARY)
-
-# dng sdk unittests for target
-# ========================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := dng_validate
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
-    $(dng_sdk_files) \
-    source/dng_validate.cpp
-
-LOCAL_CFLAGS := -DUNIX_ENV=1 -DqDNGBigEndian=0 -DqDNGThreadSafe=1 -DqDNGUseLibJPEG=1 -DqDNGUseXMP=0 -DqDNGValidate=1 -DqDNGValidateTarget=1 -DqAndroid=1 -fexceptions -Wsign-compare -Wno-reorder -Wframe-larger-than=20000 -frtti
-
-LOCAL_SHARED_LIBRARIES := libz libjpeg
-
-include $(BUILD_EXECUTABLE)