浏览代码

Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

Conflicts:
	display-client/project.properties
leijie 8 年之前
父节点
当前提交
29a5cb0c17
共有 2 个文件被更改,包括 27 次插入0 次删除
  1. 3 0
      display-client/assets/count-config.xml
  2. 24 0
      display-client/project.properties

+ 3 - 0
display-client/assets/count-config.xml

@ -0,0 +1,3 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<config>
3
</config>

+ 24 - 0
display-client/project.properties

@ -0,0 +1,24 @@
1
# This file is automatically generated by Android Tools.
2
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
3
#
4
# This file must be checked in Version Control Systems.
5
#
6
# To customize properties used by the Ant build system edit
7
# "ant.properties", and override values to adapt the script to your
8
# project structure.
9
#
10
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
11
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12
13
# Project target.
14
target=android-22
15
android.library=false
16
android.library.reference.1=../../android/ipu-push
17
android.library.reference.2=../wade-mobile-lib
18
android.library.reference.3=../ipu-baidumap-lib
19
android.library.reference.4=../ipu-pathmenu
20
android.library.reference.9=../wade-mobile-common
21
android.library.reference.5=../../android/ipu-voice
22
android.library.reference.6=../ipu-open-platform
23
android.library.reference.7=../ipu-bluetooth
24
android.library.reference.10=../../android/ipu-share