Skip to content

Commit 3399c4c

Browse files
desokroshanChunqiang SUN
authored andcommitted
Build fixes (#720)
* Update copy_libs.py * Update build.gradle
1 parent 3d4b4f5 commit 3399c4c

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

CircleciScripts/copy_libs.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
os.makedirs(dest)
1111
modules = getmodules(root)
1212
for module in modules:
13-
print(module)
14-
jarfile = os.path.join(root,module,"build/libs/{0}.jar".format(module))
15-
if os.path.isfile(jarfile) :
16-
destfile = os.path.join(dest, "{0}.jar".format(module))
17-
copyfile(jarfile, destfile)
18-
else:
19-
aarfile = os.path.join(root,module,"build/outputs/aar/{0}-release.aar".format(module))
20-
if os.path.isfile(aarfile) :
21-
destfile = os.path.join(dest, "{0}.aar".format(module))
22-
copyfile(aarfile, destfile)
23-
print("copied {0} to {1}".format(aarfile, destfile))
13+
if 'test' not in module :
14+
print(module)
15+
jarfile = os.path.join(root,module,"build/libs/{0}.jar".format(module))
16+
if os.path.isfile(jarfile) :
17+
destfile = os.path.join(dest, "{0}.jar".format(module))
18+
copyfile(jarfile, destfile)
2419
else:
25-
print("Did not find build result for {0}".format(module))
26-
exit(1)
27-
20+
aarfile = os.path.join(root,module,"build/outputs/aar/{0}-release.aar".format(module))
21+
if os.path.isfile(aarfile) :
22+
destfile = os.path.join(dest, "{0}.aar".format(module))
23+
copyfile(aarfile, destfile)
24+
print("copied {0} to {1}".format(aarfile, destfile))
25+
else:
26+
print("Did not find build result for {0}".format(module))
27+
exit(1)

aws-android-sdk-testutils/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
lintOptions {
23+
disable 'InvalidPackage'
24+
}
2225

2326
}
2427

0 commit comments

Comments
 (0)