aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAn-Cheng Chung <ancheng@google.com>2015-07-07 16:35:58 -0700
committerAn-Cheng Chung <ancheng@google.com>2015-07-07 16:38:07 -0700
commitd2256df36df8778a3743e0a71eab0cc5106b98c9 (patch)
treec9c9e44f9d5df69cfb3a8c3cf6f31f818ab38039
parent2b56cc1c1442ba598ed1ee9c23e8e9eade076e77 (diff)
downloadzxing-marshmallow-dr1.5-release.tar.gz
Update core.jar to r2864 in google3.android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1nougat-mr1-wear-releasen-iot-preview-2marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
Path in google3: //depot/google3/third_party/zxing/java/core.jar Bug: 21592800 Change-Id: I7d36b4d301a0726caa5838fcf4da555c291bc2b9
-rw-r--r--core/README.google6
-rw-r--r--core/build.gradle1
-rw-r--r--core/core.jarbin394530 -> 531931 bytes
-rw-r--r--qr_scanner/build.gradle13
4 files changed, 17 insertions, 3 deletions
diff --git a/core/README.google b/core/README.google
index 03c873ef9..420ec2b9f 100644
--- a/core/README.google
+++ b/core/README.google
@@ -1,6 +1,6 @@
-URL: svn checkout -r 1937 http://zxing.googlecode.com/svn/trunk/ zxing-read-only
+URL: http://zxing.googlecode.com/svn/!svn/bc/2864/trunk/
-Version: 1.7.1 (Revision: r1937)
+Version: r2864
License: Apache License 2.0
@@ -13,4 +13,4 @@ QR Codes, Data Matrix, and the UPC family of 1D barcodes. It will provide
clients for J2ME, J2SE, and Android.
Local Modifications:
-No modifications.
+See https://cs.corp.google.com/#piper///depot/google3/third_party/zxing/README.google.
diff --git a/core/build.gradle b/core/build.gradle
new file mode 100644
index 000000000..084a48fae
--- /dev/null
+++ b/core/build.gradle
@@ -0,0 +1 @@
+artifacts.add('default', file('core.jar')) \ No newline at end of file
diff --git a/core/core.jar b/core/core.jar
index 43a314099..64c658c3a 100644
--- a/core/core.jar
+++ b/core/core.jar
Binary files differ
diff --git a/qr_scanner/build.gradle b/qr_scanner/build.gradle
new file mode 100644
index 000000000..bf997a6a2
--- /dev/null
+++ b/qr_scanner/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'com.android.library'
+
+android {
+ sourceSets.main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ res.srcDirs = ['res']
+ }
+}
+
+dependencies {
+ compile project(':zxing-core')
+} \ No newline at end of file