Skip to content

Commit 4dc0541

Browse files
author
Stewart Miles
committed
Integrate Latest @ 118712744
CL: 118712744
1 parent 2148692 commit 4dc0541

File tree

40 files changed

+2780
-0
lines changed

40 files changed

+2780
-0
lines changed

admob/testapp/AndroidManifest.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.google.android.admob.testapp"
4+
android:versionCode="1"
5+
android:versionName="1.0">
6+
<uses-permission android:name="android.permission.INTERNET" />
7+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
8+
<uses-permission android:name="android.permission.WAKE_LOCK" />
9+
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
10+
<application android:label="@string/app_name">
11+
<activity android:name="android.app.NativeActivity"
12+
android:screenOrientation="portrait">
13+
<meta-data android:name="android.app.lib_name"
14+
android:value="android_main" />
15+
<intent-filter>
16+
<action android:name="android.intent.action.MAIN" />
17+
<category android:name="android.intent.category.LAUNCHER" />
18+
</intent-filter>
19+
</activity>
20+
</application>
21+
</manifest>

admob/testapp/LICENSE

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

admob/testapp/Podfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
source 'https://cpdc-eap.googlesource.com/spec.git'
2+
source 'https://github.com/CocoaPods/Specs.git'
3+
platform :ios, '7.0'
4+
# AdMob test application.
5+
target 'testapp' do
6+
pod 'Firebase/Core'
7+
pod 'Google-Mobile-Ads-SDK', '~> 7.7
8+
end

admob/testapp/build.gradle

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
buildscript {
3+
repositories {
4+
mavenLocal()
5+
jcenter()
6+
}
7+
dependencies {
8+
classpath 'com.android.tools.build:gradle:1.5.0'
9+
classpath 'com.google.gms:google-services:1.5.1-beta2'
10+
}
11+
}
12+
13+
allprojects {
14+
repositories {
15+
mavenLocal()
16+
jcenter()
17+
}
18+
}
19+
20+
apply plugin: 'com.android.application'
21+
22+
android {
23+
compileSdkVersion 23
24+
buildToolsVersion '23.0.1'
25+
26+
sourceSets {
27+
main {
28+
jniLibs.srcDirs = ['libs']
29+
manifest.srcFile 'AndroidManifest.xml'
30+
java.srcDirs = ['src/android/java']
31+
res.srcDirs = ['res']
32+
}
33+
}
34+
35+
defaultConfig {
36+
applicationId 'com.google.android.admob.testapp'
37+
minSdkVersion 14
38+
targetSdkVersion 23
39+
versionCode 1
40+
versionName '1.0'
41+
}
42+
buildTypes {
43+
release {
44+
// Proguard temporarily disabled until we have a template for
45+
// classes referenced from JNI that shouldn't be stripped.
46+
//minifyEnabled true
47+
//proguardFiles getDefaultProguardFile('proguard-android.txt')
48+
}
49+
}
50+
}
51+
52+
dependencies {
53+
compile fileTree(dir: 'libs', include: ['*.jar'])
54+
compile 'com.google.android.gms:play-services-ads:8.5.4'
55+
}
56+
57+
apply plugin: 'com.google.gms.google-services'
58+
59+
// Pre-experimental Gradle plug-in NDK boilerplate below.
60+
// Right now the Firebase plug-in does not work with the experimental
61+
// Gradle plug-in so we're using ndk-build for the moment.
62+
project.ext {
63+
// Configure the Firebase C++ SDK location.
64+
firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
65+
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
66+
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
67+
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
68+
if ((new File('firebase_cpp_sdk')).exists()) {
69+
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
70+
} else {
71+
throw new StopActionException(
72+
'firebase_cpp_sdk.dir property or the FIREBASE_CPP_SDK_DIR ' +
73+
'environment variable must be set to reference the Firebase C++ ' +
74+
'SDK install directory. This is used to configure static library ' +
75+
'and C/C++ include paths for the SDK.')
76+
}
77+
}
78+
}
79+
if (!(new File(firebase_cpp_sdk_dir)).exists()) {
80+
throw new StopActionException(
81+
sprintf('Firebase C++ SDK directory %s does not exist',
82+
firebase_cpp_sdk_dir))
83+
}
84+
// Check the NDK location using the same configuration options as the
85+
// experimental Gradle plug-in.
86+
ndk_dir = project.android.ndkDirectory
87+
if (ndk_dir == null || !ndk_dir.exists()) {
88+
ndk_dir = System.getenv('ANDROID_NDK_HOME')
89+
if (ndk_dir == null || ndk_dir.isEmpty()) {
90+
throw new StopActionException(
91+
'Android NDK directory should be specified using the ndk.dir ' +
92+
'property or ANDROID_NDK_HOME environment variable.')
93+
}
94+
}
95+
}
96+
97+
task ndkBuildCompile(type:Exec) {
98+
description 'Use ndk-build to compile the C++ application.'
99+
commandLine("${project.ext.ndk_dir}${File.separator}ndk-build",
100+
"FIREBASE_CPP_SDK_DIR=${project.ext.firebase_cpp_sdk_dir}",
101+
sprintf("APP_PLATFORM=android-%d",
102+
android.defaultConfig.minSdkVersion.mApiLevel))
103+
}
104+
105+
task ndkBuildClean(type:Exec) {
106+
description 'Use ndk-build to clean the C++ application.'
107+
commandLine("${project.ext.ndk_dir}${File.separator}ndk-build",
108+
"FIREBASE_CPP_SDK_DIR=${project.ext.firebase_cpp_sdk_dir}",
109+
"clean")
110+
}
111+
112+
// Once the Android Gradle plug-in has generated tasks, add dependencies for
113+
// the ndk-build targets.
114+
project.afterEvaluate {
115+
preBuild.dependsOn(ndkBuildCompile)
116+
clean.dependsOn(ndkBuildClean)
117+
}
48.7 KB
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Wed Apr 10 15:27:10 PDT 2013
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 commit comments

Comments
 (0)