[android] applied Gerry Reno's patch for Android-4.4
This commit is contained in:
Michael Rash
parent
8ed0d9d8d9
commit
d43d2fc817
@ -14,6 +14,6 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="8"/>
|
||||
<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="19"/>
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
</manifest>
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
# SDK paths
|
||||
sdk.dir=/home/mbr/src/android-sdk-linux
|
||||
ndk.dir=/home/mbr/src/android-ndk-r8b
|
||||
|
||||
# if you want to deploy to a website#
|
||||
#deploy.dir=/home/yourname/public_html
|
||||
|
||||
# Currently platform supported is Android 7 (2.1)
|
||||
platforms.Android_fwknop.aapt=${sdk.dir}/platform-tools/aapt
|
||||
platforms.Android_fwknop.adb=${sdk.dir}/platform-tools/adb
|
||||
platforms.Android_fwknop.apkbuilder=${sdk.dir}/tools/apkbuilder
|
||||
platforms.Android_fwknop.bootclasspath=${platforms.Android_fwknop.home}/android.jar
|
||||
platforms.Android_fwknop.bootclasspath0=${platforms.Android_fwknop.home}/android.jar
|
||||
platforms.Android_fwknop.dx=${sdk.dir}/platform-tools/dx
|
||||
platforms.Android_fwknop.emulator=${sdk.dir}/tools/emulator
|
||||
platforms.Android_fwknop.home=${sdk.dir}/platforms/android-16
|
||||
@ -1,16 +0,0 @@
|
||||
# SDK paths
|
||||
sdk.dir=/home/dstuart/android-sdk-linux_86
|
||||
ndk.dir=/home/dstuart/android-ndk-r5
|
||||
|
||||
# if you want to deploy to a website#
|
||||
#deploy.dir=/home/yourname/public_html
|
||||
|
||||
# Currently platform supported is Android 7 (2.1)
|
||||
platforms.Android2.1.aapt=${platforms.Android2.1.home}/tools/aapt
|
||||
platforms.Android2.1.adb=${sdk.dir}/tools/adb
|
||||
platforms.Android2.1.apkbuilder=${sdk.dir}/tools/apkbuilder
|
||||
platforms.Android2.1.bootclasspath=${platforms.Android2.1.home}/android.jar
|
||||
platforms.Android2.1.bootclasspath0=${platforms.Android2.1.home}/android.jar
|
||||
platforms.Android2.1.dx=${platforms.Android2.1.home}/tools/dx
|
||||
platforms.Android2.1.emulator=${sdk.dir}/tools/emulator
|
||||
platforms.Android2.1.home=${sdk.dir}/platforms/android-7
|
||||
@ -1,67 +1,94 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project name="fwknop-android" default="jar">
|
||||
<project name="fwknop-android" default="help">
|
||||
<!--
|
||||
<import file="nbproject/build-impl.xml"/>
|
||||
-->
|
||||
<!-- The local.properties file is created and updated by the 'android' tool.
|
||||
It contains the path to the SDK. It should *NOT* be checked in in Version
|
||||
Control Systems. -->
|
||||
It contains the path to the SDK. It should *NOT* be checked into
|
||||
Version Control Systems. -->
|
||||
<property file="local.properties" />
|
||||
|
||||
<!-- The build.properties file can be created by you and is never touched
|
||||
by the 'android' tool. This is the place to change some of the default property values
|
||||
used by the Ant rules.
|
||||
<!-- The ant.properties file can be created by you. It is only edited by the
|
||||
'android' tool to add properties to it.
|
||||
This is the place to change some Ant specific build properties.
|
||||
Here are some properties you may want to change/update:
|
||||
|
||||
application.package
|
||||
the name of your application package as defined in the manifest. Used by the
|
||||
'uninstall' rule.
|
||||
source.dir
|
||||
the name of the source directory. Default is 'src'.
|
||||
The name of the source directory. Default is 'src'.
|
||||
out.dir
|
||||
the name of the output directory. Default is 'bin'.
|
||||
The name of the output directory. Default is 'bin'.
|
||||
|
||||
Properties related to the SDK location or the project target should be updated
|
||||
using the 'android' tool with the 'update' action.
|
||||
For other overridable properties, look at the beginning of the rules
|
||||
files in the SDK, at tools/ant/build.xml
|
||||
|
||||
This file is an integral part of the build system for your application and
|
||||
should be checked in in Version Control Systems.
|
||||
Properties related to the SDK location or the project target should
|
||||
be updated using the 'android' tool with the 'update' action.
|
||||
|
||||
This file is an integral part of the build system for your
|
||||
application and should be checked into Version Control Systems.
|
||||
|
||||
-->
|
||||
<property file="build.properties" />
|
||||
<property file="ant.properties" />
|
||||
|
||||
<!-- The default.properties file is created and updated by the 'android' tool, as well
|
||||
as ADT.
|
||||
This file is an integral part of the build system for your application and
|
||||
should be checked in in Version Control Systems. -->
|
||||
<property file="default.properties" />
|
||||
<!-- if sdk.dir was not set from one of the property file, then
|
||||
get it from the ANDROID_HOME env var.
|
||||
This must be done before we load project.properties since
|
||||
the proguard config can use sdk.dir -->
|
||||
<property environment="env" />
|
||||
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
|
||||
<isset property="env.ANDROID_HOME" />
|
||||
</condition>
|
||||
|
||||
<!-- Custom Android task to deal with the project target, and import the proper rules.
|
||||
This requires ant 1.6.0 or above. -->
|
||||
<path id="android.antlibs">
|
||||
<pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
|
||||
<pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
|
||||
<pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
|
||||
<pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
|
||||
<pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
|
||||
</path>
|
||||
<!-- The project.properties file is created and updated by the 'android'
|
||||
tool, as well as ADT.
|
||||
|
||||
<!-- <taskdef name="setup"
|
||||
classname="com.android.ant.SetupTask"
|
||||
classpathref="android.antlibs" />-->
|
||||
This contains project specific properties such as project target, and library
|
||||
dependencies. Lower level build properties are stored in ant.properties
|
||||
(or in .classpath for Eclipse projects).
|
||||
|
||||
<!-- Execute the Android Setup task that will setup some properties specific to the target,
|
||||
and import the build rules files.
|
||||
This file is an integral part of the build system for your
|
||||
application and should be checked into Version Control Systems. -->
|
||||
<loadproperties srcFile="project.properties" />
|
||||
|
||||
The rules file is imported from
|
||||
<SDK>/platforms/<target_platform>/templates/android_rules.xml
|
||||
<!-- quick check on sdk.dir -->
|
||||
<fail
|
||||
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
|
||||
unless="sdk.dir"
|
||||
/>
|
||||
|
||||
To customize some build steps for your project:
|
||||
- copy the content of the main node <project> from android_rules.xml
|
||||
- paste it in this build.xml below the <setup /> task.
|
||||
- disable the import by changing the setup task below to <setup import="false" />
|
||||
|
||||
This will ensure that the properties are setup correctly but that your customized
|
||||
build steps are used.
|
||||
<!--
|
||||
Import per project custom build rules if present at the root of the project.
|
||||
This is the place to put custom intermediary targets such as:
|
||||
-pre-build
|
||||
-pre-compile
|
||||
-post-compile (This is typically used for code obfuscation.
|
||||
Compiled code location: ${out.classes.absolute.dir}
|
||||
If this is not done in place, override ${out.dex.input.absolute.dir})
|
||||
-post-package
|
||||
-post-build
|
||||
-pre-clean
|
||||
-->
|
||||
<!--<setup />-->
|
||||
<import file="custom_rules.xml" optional="true" />
|
||||
|
||||
<!-- Import the actual build file.
|
||||
|
||||
To customize existing targets, there are two options:
|
||||
- Customize only one target:
|
||||
- copy/paste the target into this file, *before* the
|
||||
<import> task.
|
||||
- customize it to your needs.
|
||||
- Customize the whole content of build.xml
|
||||
- copy/paste the content of the rules files (minus the top node)
|
||||
into this file, replacing the <import> task.
|
||||
- customize to your needs.
|
||||
|
||||
***********************
|
||||
****** IMPORTANT ******
|
||||
***********************
|
||||
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
||||
in order to avoid having your file be overridden by tools such as "android update project"
|
||||
-->
|
||||
<!-- version-tag: 1 -->
|
||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||
|
||||
</project>
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
# This file is automatically generated by Android Tools.
|
||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||
#
|
||||
# This file must be checked in Version Control Systems.
|
||||
#
|
||||
# To customize properties used by the Ant build system use,
|
||||
# "build.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=Google Inc.:Google APIs:7
|
||||
@ -19,11 +19,12 @@ LOCAL_PATH:= $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := libfwknop
|
||||
|
||||
LOCAL_CFLAGS := -W -g -DHAVE_CONFIG_H \
|
||||
-I$(LOCAL_PATH)/../../../common \
|
||||
-I$(LOCAL_PATH) \
|
||||
-I$(LOCAL_PATH)/fwknop \
|
||||
-I$(LOCAL_PATH)/libfwknop
|
||||
|
||||
LOCAL_SRC_FILES := $(shell cd $(LOCAL_PATH); \
|
||||
find ./fwknop/ -type f -name '*.c'; \
|
||||
find ./libfwknop/ -type f -name '*.c'; \
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
/* AUTO-GENERATED FILE. DO NOT MODIFY.
|
||||
*
|
||||
* This class was automatically generated by the
|
||||
* aapt tool from the resource data it found. It
|
||||
* should not be modified by hand.
|
||||
*/
|
||||
|
||||
package com.max2idea.android.fwknop;
|
||||
|
||||
public final class R {
|
||||
public static final class attr {
|
||||
}
|
||||
public static final class drawable {
|
||||
public static final int icon=0x7f020000;
|
||||
public static final int lock_128x128=0x7f020001;
|
||||
public static final int lock_32x32=0x7f020002;
|
||||
public static final int lock_64x64=0x7f020003;
|
||||
}
|
||||
public static final class id {
|
||||
public static final int accessPort=0x7f050008;
|
||||
public static final int accessPortStr=0x7f050007;
|
||||
public static final int accessPortl=0x7f050006;
|
||||
public static final int accessProto=0x7f050005;
|
||||
public static final int accessProtoStr=0x7f050004;
|
||||
public static final int accessProtol=0x7f050003;
|
||||
public static final int allowip=0x7f050002;
|
||||
public static final int allowipl=0x7f050000;
|
||||
public static final int allowipstr=0x7f050001;
|
||||
public static final int destIP=0x7f05000b;
|
||||
public static final int destIPStr=0x7f05000a;
|
||||
public static final int destIPl=0x7f050009;
|
||||
public static final int fwTimeout=0x7f05000e;
|
||||
public static final int fwTimeoutStr=0x7f05000d;
|
||||
public static final int fwTimeoutl=0x7f05000c;
|
||||
public static final int output=0x7f050016;
|
||||
public static final int passwd=0x7f050011;
|
||||
public static final int passwdStr=0x7f050010;
|
||||
public static final int passwdl=0x7f05000f;
|
||||
public static final int startApp=0x7f050013;
|
||||
public static final int startAppCheck=0x7f050014;
|
||||
public static final int startAppl=0x7f050012;
|
||||
public static final int startl=0x7f050015;
|
||||
public static final int unlock=0x7f050017;
|
||||
}
|
||||
public static final class layout {
|
||||
public static final int main=0x7f030000;
|
||||
}
|
||||
public static final class string {
|
||||
public static final int app_name=0x7f040000;
|
||||
public static final int app_short_name=0x7f040001;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user