commit 596327a6a48d0b3206bad99d90227334dc55df17
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 28 13:56:24 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 28 13:56:24 2023 +0000
tree 2d0d879b2559ddbd9d079721d972590b54a0b4b4
parent 47cf8d6c8d0e72fba821be376e5fe3206591a67a
parent 76d7e21670c9a6d7c127ac4c1206f51e75001049

Merge "Fix handling shell command when no argument is given." into main

services/camera/virtualcamera/.clang-format

diff --git a/services/camera/virtualcamera/.clang-format b/services/camera/virtualcamera/.clang-format
new file mode 100644
index 0000000..f397454
--- /dev/null
+++ b/services/camera/virtualcamera/.clang-format
@@ -0,0 +1,12 @@
+BasedOnStyle: Google
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+
+ColumnLimit: 80
+ContinuationIndentWidth: 4
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IndentWidth: 2
+PointerAlignment: Left
+UseTab: Never
+PenaltyExcessCharacter: 32
\ No newline at end of file

services/camera/virtualcamera/Android.bp

diff --git a/services/camera/virtualcamera/Android.bp b/services/camera/virtualcamera/Android.bp
index ff7b037..c8fa84e 100644
--- a/services/camera/virtualcamera/Android.bp
+++ b/services/camera/virtualcamera/Android.bp
@@ -34,11 +34,11 @@
         "virtual_camera_service_aidl-ndk",
     ],
     cflags: [
+        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
         "-Wall",
         "-Werror",
         "-Wformat",
         "-Wthread-safety",
-        "-DLOG_NDEBUG=0"
     ],
 }