Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TIMOB-6135 update androidsdk.py and common.xml to accomodate new location of google apis #659

Merged
merged 1 commit into from
Nov 9, 2011
Merged

TIMOB-6135 update androidsdk.py and common.xml to accomodate new location of google apis #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion android/build/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,12 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
<property name="google.apis" location="${env.GOOGLE_APIS}"/>
</then>
<else>
<property name="google.apis" location="${android.sdk}/add-ons/addon_google_apis_google_inc_8"/>
<if>
<not><isset property="google.apis"/></not>
<then>
<property name="google.apis" location="${android.sdk}/add-ons/addon_google_apis_google_inc_8"/>
</then>
</if>
</else>
</if>
</else>
Expand Down
4 changes: 4 additions & 0 deletions support/android/androidsdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ def find_platform_dir(self):
self.platform_dir = platform_dir

def find_google_apis_dir(self):
if 'GOOGLE_APIS' in os.environ:
return os.environ['GOOGLE_APIS']
self.google_apis_dir = self.find_dir(self.api_level, os.path.join('add-ons', 'google_apis-'))
if self.google_apis_dir is None:
self.google_apis_dir = self.find_dir(self.api_level, os.path.join('add-ons', 'addon_google_apis_google_inc_'))
if self.google_apis_dir is None:
self.google_apis_dir = self.find_dir(self.api_level, os.path.join('add-ons', 'addon-google_apis-google_inc_-'))

def get_maps_jar(self):
if self.google_apis_dir is not None:
Expand Down