Skip to content

Commit

Permalink
Change to use clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
hoangpq committed Mar 13, 2021
1 parent 00da9c7 commit 40a02e0
Show file tree
Hide file tree
Showing 19 changed files with 283 additions and 251 deletions.
36 changes: 36 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Use the Google style in this project.
BasedOnStyle: Google

# Some folks prefer to write "int& foo" while others prefer "int &foo". The
# Google Style Guide only asks for consistency within a project, we chose
# "int& foo" for this project:
DerivePointerAlignment: false
PointerAlignment: Left

IncludeBlocks: Merge
IncludeCategories:
# Matches common headers first, but sorts them after project includes
- Regex: '^\"google/cloud/(internal/|grpc_utils/|testing_util/|[^/]+\.h)'
Priority: 1000
- Regex: '^\"google/cloud/' # project includes should sort first
Priority: 500
- Regex: '^\"'
Priority: 1500
- Regex: '^<grpc/'
Priority: 2000
- Regex: '^<google/*'
Priority: 3000
- Regex: '^<.*/.*'
Priority: 4000
- Regex: '^<[^/]*>'
Priority: 5000

# Format raw string literals with a `pb` or `proto` tag as proto.
RawStringFormats:
- Language: TextProto
Delimiters:
- 'pb'
- 'proto'
BasedOnStyle: Google

CommentPragmas: '(@copydoc)'
13 changes: 9 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ android {
minifyEnabled false
shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

// The doNotStrip option is not properly scoped to the "debug" build type
// See https://issuetracker.google.com/issues/155215248.
packagingOptions {
doNotStrip "**/*.so"
}
debuggable true
jniDebuggable true
}
release {
minifyEnabled true
Expand All @@ -54,17 +62,14 @@ android {
}
}

packagingOptions {
doNotStrip "**/*.so"
}
ndkVersion '21.0.6113669'

preBuild.dependsOn(rootProject.cargo)

}

dependencies {
implementation project(":inspector")
// implementation project(":inspector")
implementation 'com.github.tbruyelle:rxpermissions:0.10.2'
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
Expand Down
Loading

0 comments on commit 40a02e0

Please sign in to comment.