修改如下，直接看补丁：

diff --git a/external/rkaiq_tool_server/Android.bp b/external/rkaiq_tool_server/Android.bp
index 5cef0aeb0f..6df0245b65 100755
--- a/external/rkaiq_tool_server/Android.bp
+++ b/external/rkaiq_tool_server/Android.bp
@@ -45,7 +45,6 @@ cc_defaults {
         "rk_aiq/iq_parser_v2",
         "rk_aiq/uAPI",
         "rk_aiq/uAPI/include",
-        "rk_aiq/uAPI2",
         "rk_aiq/common",
         "rk_aiq/include",
         "rk_aiq/include/iq_parser",
diff --git a/hardware/rockchip/libhwjpeg/Android.bp b/hardware/rockchip/libhwjpeg/Android.bp
index 09ecffc0b0..c4806ea8f3 100644
--- a/hardware/rockchip/libhwjpeg/Android.bp
+++ b/hardware/rockchip/libhwjpeg/Android.bp
@@ -3,7 +3,7 @@ genrule {
     srcs: [
         "version.h.template",
         "genversion.sh",
-        ".git/HEAD",
+        //".git/HEAD",
     ],
     cmd: "bash $(location genversion.sh) > $(out)",
     out: ["version.h"],
diff --git a/hardware/rockchip/libmpimmz/Android.bp b/hardware/rockchip/libmpimmz/Android.bp
index 14f13c46f0..8189d5a4c5 100644
--- a/hardware/rockchip/libmpimmz/Android.bp
+++ b/hardware/rockchip/libmpimmz/Android.bp
@@ -26,7 +26,7 @@ genrule {
     srcs: libmpimmz_src + [
         "version.sh",
         "version.h.template",
-        ".git/HEAD"
+        //".git/HEAD"
     ],
     out: ["version.h"],
     cmd: "bash $(location version.sh) < $(in) > $(out)",
diff --git a/packages/services/Iwlan/Android.bp b/packages/services/Iwlan/Android.bp
index f9a785ba62..3f0f02b585 100644
--- a/packages/services/Iwlan/Android.bp
+++ b/packages/services/Iwlan/Android.bp
@@ -9,9 +9,9 @@ android_app {
         "src/**/*.java",
         "src/**/I*.aidl",
     ],
-    resource_dirs: [
-        "res",
-    ],
+    //resource_dirs: [
+    //    "res",
+    //],
     static_libs: [
         "android-support-annotations",
     ],
diff --git a/vendor/rockchip/hardware/interfaces/codec2/Android.bp b/vendor/rockchip/hardware/interfaces/codec2/Android.bp
index a501ac07e9..897892aaa4 100644
--- a/vendor/rockchip/hardware/interfaces/codec2/Android.bp
+++ b/vendor/rockchip/hardware/interfaces/codec2/Android.bp
@@ -3,7 +3,7 @@ genrule {
     srcs: [
         "version.h.template",
         "version.sh",
-        ".git/HEAD",
+        //".git/HEAD",
     ],
     cmd: "bash $(location version.sh) > $(out)",
     out: ["C2RKVersion.h"],