Skip to content
Snippets Groups Projects
Commit e6fe42c7 authored by Kangping Dong's avatar Kangping Dong Committed by Gerrit Code Review
Browse files

Merge "[Thread] add Android.bp format to make-pretty.sh" into main

parents 71259210 c73dd5aa
No related branches found
No related tags found
No related merge requests found
...@@ -3,5 +3,7 @@ ...@@ -3,5 +3,7 @@
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
GOOGLE_JAVA_FORMAT=$SCRIPT_DIR/../../../../../prebuilts/tools/common/google-java-format/google-java-format GOOGLE_JAVA_FORMAT=$SCRIPT_DIR/../../../../../prebuilts/tools/common/google-java-format/google-java-format
ANDROID_BP_FORMAT=$SCRIPT_DIR/../../../../../prebuilts/build-tools/linux-x86/bin/bpfmt
$GOOGLE_JAVA_FORMAT --aosp -i $(find $SCRIPT_DIR/../ -name "*.java") $GOOGLE_JAVA_FORMAT --aosp -i $(find $SCRIPT_DIR/../ -name "*.java")
$ANDROID_BP_FORMAT -w $(find $SCRIPT_DIR/../ -name "*.bp")
...@@ -45,7 +45,7 @@ android_test { ...@@ -45,7 +45,7 @@ android_test {
libs: [ libs: [
"android.test.base", "android.test.base",
"android.test.runner", "android.test.runner",
"framework-connectivity-module-api-stubs-including-flagged" "framework-connectivity-module-api-stubs-including-flagged",
], ],
// Test coverage system runs on different devices. Need to // Test coverage system runs on different devices. Need to
// compile for all architectures. // compile for all architectures.
......
...@@ -43,7 +43,7 @@ android_test { ...@@ -43,7 +43,7 @@ android_test {
manifest: "AndroidManifest.xml", manifest: "AndroidManifest.xml",
defaults: [ defaults: [
"framework-connectivity-test-defaults", "framework-connectivity-test-defaults",
"ThreadNetworkIntegrationTestsDefaults" "ThreadNetworkIntegrationTestsDefaults",
], ],
test_suites: [ test_suites: [
"general-tests", "general-tests",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment