Commit Graph

8 Commits

Author SHA1 Message Date
Marc Audy
42f614c946 Fix shadowed variables
[CL 2478499 by Marc Audy in Main branch]
2015-03-13 10:01:08 -04:00
Ben Marsh
e789028809 [INTEGRATE] Change 2423627 by Robert.Jones@Pitbull-RJones on 2015/01/29 07:23:55
UE-8509 Android SDK Paths being saved even if the user doesn't set them
	- removed initial pull of data on start up

[CL 2425929 by Ben Marsh in Main branch]
2015-01-30 11:30:32 -05:00
Ben Marsh
e62b9e2062 [INTEGRATE] Change 2418550 by Robert.Jones@Pitbull-RJones on 2015/01/26 08:53:09
Removing JAVA_HOME from Mac Editor builds

[CL 2419719 by Ben Marsh in Main branch]
2015-01-26 20:18:29 -05:00
James Moran
c5b4ca076e HTML5 SDK settings are now set via the Editor.
Android SDK path backslash duplication fix.
Fix for User inis not saving array properties correctly.

#codereview Ankit.Khare, Josh.Adams

[CL 2418611 by James Moran in Main branch]
2015-01-26 10:22:57 -05:00
Robert Jones
653f45a33a Adding Java_Home support to ini files for Android building.
[CL 2415356 by Robert Jones in Main branch]
2015-01-22 11:14:12 -05:00
Josh Adams
9cf8c67c77 - Generate AndroidManifest.xml from ProjectSettings
- Moved some Android settings to ProjectSettings, re-enabled SDK settings
- Removed SigningConfig.xml, and moved those settings into project settings
- Added concept of NotForLicensees and NoRedist engine and project config settings
- Removed BaseInternalGame.ini, replaced with NotForLicensees/BaseGame.ini
- Moved User*.ini to end of .ini hierarchy
- Added support for CLASS_GlobalUserConfig, so their settings will be saved to <AppData>/.../User*.ini (useful for SDK paths, etc)
- Enabled AndroidPlatformEditor module on Mac
- Changed Mac Build.sh to allow for Android on the commandline (just pass through if it's not an Xcode platform name)
- Iterative Android packaging now looks at just the important .ini sections, NOT entire .ini files

#codereview jamie.dale,james.moran,michael.trepka,robert.jones,chris.babcock

[CL 2413870 by Josh Adams in Main branch]
2015-01-21 11:17:55 -05:00
Chris Babcock
3edc2a3401 Fixed Android SDKPath fallback to ANDROID_HOME environment variable
#ue4
#android
#codereview Rob.Jones,Josh.Adams

[CL 2412728 by Chris Babcock in Main branch]
2015-01-20 15:20:24 -05:00
Robert Jones
b5a273a278 SDK path editing in editor.
- Added class to hold values (AndroidSDKSettings)
- Added code to Android editor module to setup the values on load
- Changed device detection so that the thread is always started and the SDK path can be changed on the fly
- Changed Platform Target Management Module so that a single platform can be checked via UBT
- Settings can now be sourced from an ini file via temp direct reading code (auto seralisation is disabled until later changes are made)
-- Settings currently not exposed in editor

- Added Mac Environment var setting support

Unreleated
- Envars can now be passed down to process start points in tools

#codereview michael.trepka

[CL 2412194 by Robert Jones in Main branch]
2015-01-20 10:05:42 -05:00