diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9515b25
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,2 @@
+soong_namespace {
+}
diff --git a/datatop/Android.mk b/datatop/Android.mk
index 8338432..e1c3023 100644
--- a/datatop/Android.mk
+++ b/datatop/Android.mk
@@ -1,2 +1,3 @@
+ifeq ($(call my-dir),$(call project-path-for,qcom-dataservices))
 include $(call all-subdir-makefiles)
-
+endif