diff --git a/gyotaku_app/gyotaku.mk b/gyotaku_app/gyotaku.mk
index e2d26e5..fa58556 100644
--- a/gyotaku_app/gyotaku.mk
+++ b/gyotaku_app/gyotaku.mk
@@ -1,6 +1,8 @@
 ifneq ($(TARGET_BUILD_VARIANT), user)
-  PRODUCT_PACKAGES_DEBUG += \
+  ifeq (,$(filter aosp_%, $(TARGET_PRODUCT))) # Skip aosp target product
+    PRODUCT_PACKAGES_DEBUG += \
       Gyotaku
 
-  BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/sepolicy/
+      BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/sepolicy/
+  endif
 endif