Skip to content

Commit a334714

Browse files
Move android examples from src/android to examples/android (#22946)
* Move android examples from src/android to examples/android * Update docs Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent 852c879 commit a334714

File tree

185 files changed

+75
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+75
-81
lines changed

.github/boring-cyborg.yml

-3
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ labelPRBasedOnFilePath:
8282
ble:
8383
- src/ble/*
8484

85-
android:
86-
- src/android/*
87-
8885
app:
8986
- src/app/*
9087

.github/labeler.yml

-4
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ ble:
140140
- src/ble/*
141141
- src/ble/**/*
142142

143-
android:
144-
- src/android/*
145-
- src/android/**/*
146-
147143
app:
148144
- src/app/*
149145
- src/app/**/*

.restyled.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ exclude:
6565
- "third_party/bluez/repo/**/*"
6666
- "third_party/cirque/repo/**/*"
6767
- "third_party/nanopb/repo/**/*"
68-
- "src/android/CHIPTool/gradlew" # gradle wrapper generated file
68+
- "examples/android/CHIPTool/gradlew" # gradle wrapper generated file
6969
- "third_party/android_deps/gradlew" # gradle wrapper generated file
7070
- "src/controller/python/chip/clusters/Objects.py" # generated file, no point to restyle
7171
- "src/controller/python/chip/clusters/CHIPClusters.py" # generated file, no point to restyle

docs/guides/android_building.md

+8-7

docs/guides/esp32/build_app_and_commission.md

+1-1

docs/guides/mbedos_commissioning.md

+1-1

docs/guides/nrfconnect_android_commissioning.md

+1-1

docs/guides/nxp_k32w_android_commissioning.md

+3-3

examples/all-clusters-app/nrfconnect/README.md

+1-1

examples/all-clusters-minimal-app/nrfconnect/README.md

+1-1
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

examples/lighting-app/nrfconnect/README.md

+1-1

examples/lock-app/nrfconnect/README.md

+1-1

examples/pump-app/cc13x2x7_26x2x7/README.md

+1-1

examples/pump-app/nrfconnect/README.md

+1-1

examples/pump-controller-app/cc13x2x7_26x2x7/README.md

+1-1

examples/pump-controller-app/nrfconnect/README.md

+1-1

examples/window-app/nrfconnect/README.md

+1-1

scripts/build/builders/android.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ def copyToSrcAndroid(self):
165165
# when using dry run.
166166
jnilibs_dir = os.path.join(
167167
self.root,
168-
"src/android/",
168+
"examples/android/",
169169
self.app.AppName(),
170170
"app/libs/jniLibs",
171171
self.board.AbiName(),
172172
)
173173
libs_dir = os.path.join(
174-
self.root, "src/android/", self.app.AppName(), "app/libs"
174+
self.root, "examples/android/", self.app.AppName(), "app/libs"
175175
)
176176
self._Execute(
177177
["mkdir", "-p", jnilibs_dir], title="Prepare Native libs " + self.identifier
@@ -272,9 +272,9 @@ def gradlewBuildSrcAndroid(self):
272272
# App compilation
273273
self._Execute(
274274
[
275-
"%s/src/android/%s/gradlew" % (self.root, self.app.AppName()),
275+
"%s/examples/android/%s/gradlew" % (self.root, self.app.AppName()),
276276
"-p",
277-
"%s/src/android/%s" % (self.root, self.app.AppName()),
277+
"%s/examples/android/%s" % (self.root, self.app.AppName()),
278278
"-PmatterBuildSrcDir=%s" % self.output_dir,
279279
"-PmatterSdkSourceBuild=false",
280280
"-PbuildDir=%s" % self.output_dir,
@@ -393,9 +393,9 @@ def _build(self):
393393
# TODO: Android Gradle with module and -PbuildDir= will caused issue, remove -PbuildDir=
394394
self._Execute(
395395
[
396-
"%s/src/android/%s/gradlew" % (self.root, self.app.AppName()),
396+
"%s/examples/android/%s/gradlew" % (self.root, self.app.AppName()),
397397
"-p",
398-
"%s/src/android/%s" % (self.root, self.app.AppName()),
398+
"%s/examples/android/%s" % (self.root, self.app.AppName()),
399399
"-PmatterBuildSrcDir=%s" % self.output_dir,
400400
"-PmatterSdkSourceBuild=true",
401401
"-PmatterSourceBuildAbiFilters=%s" % self.board.AbiName(),
@@ -423,7 +423,7 @@ def build_outputs(self):
423423
self.app.AppName()
424424
+ "-debug.apk": os.path.join(
425425
self.root,
426-
"src/android",
426+
"examples/android",
427427
self.app.AppName(),
428428
"app/build/outputs/apk/debug/app-debug.apk",
429429
)

0 commit comments

Comments
 (0)