Commit Graph

69 Commits

Author SHA1 Message Date
Dmitry Rekman
e7d1e64ee3 Changed calls to FProcHandle.Close() to FPlatformProcess::CloseProc().
We already had FPlatformProcess::CreateProc/CloseProc pair (which is part of larger set with WaitForProc(), TerminateProc(), GetProcReturnCode(), etc). FProcHandle::Close() made the API more confusing (and actually introduced bugs, because it did not call CloseProc() until recently).

#codereview Josh.Adams, Robert.Manuszewski, Jaroslaw.Surowiec

[CL 2476322 by Dmitry Rekman in Main branch]
2015-03-12 00:06:15 -04:00
Josh Adams
6ce67dbb54 - Don't tie some Android editor project settings to having the Android support files
[CL 2475911 by Josh Adams in Main branch]
2015-03-11 18:43:09 -04:00
Niklas Smedberg
ca14047362 Android ASTC for ES2
[CL 2475760 by Niklas Smedberg in Main branch]
2015-03-11 17:28:22 -04:00
Chris Babcock
0b36c32079 PR #894: wrong parsing of the return of adb cmd: device (Contributed by muzaheed57) with update to accept either tab or space
https://github.com/EpicGames/UnrealEngine/pull/894
#ue4
#android

[CL 2473228 by Chris Babcock in Main branch]
2015-03-09 20:19:58 -04:00
Gil Gribb
35cf42566a UE4 - merge GDC branch, code @2465640 to main
[CL 2468685 by Gil Gribb in Main branch]
2015-03-04 08:31:40 -05:00
Saul Abreu
79a26091bf Fixed behavior on FString::ParseIntoArray (muliple delimiters overload) functionality to support optionally culling empty strings. Greatly simplified implementation logic. Output parameter now properly named and taken by reference.
#codereview Steve.Robb, Robert.Manuszewski

[CL 2466824 by Saul Abreu in Main branch]
2015-03-02 15:51:37 -05:00
Ben Marsh
5ecb09d26f [INTEGRATE] Change 2456485 by Peter.Sauerbrei@peter.sauerbrei_MacPro on 2015/02/23 13:34:43
fix for ANDROID_HOME not being set on Mac by default
	UE-10257, UE-10277
	#lockdown josh.adams

[CL 2460097 by Ben Marsh in Main branch]
2015-02-25 08:05:13 -05:00
Josh Adams
35b9503326 - Fixed confusing Android SDK tooltips [UE-9155]
[CL 2432808 by Josh Adams in Main branch]
2015-02-04 20:25:59 -05:00
Niklas Smedberg
ac2d334930 Quick workaround for B6H and BC7 on OpenGL. This looks at the project settings (.ini) and allows D3D11 texture formats if D3D11 SM5 is the only targeted shader format, otherwise it will fall back to DXT/etc. Note that it does not check for command-line overrides, like running with -opengl.
[CL 2430775 by Niklas Smedberg in Main branch]
2015-02-03 18:35:25 -05: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
Josh Adams
b66aa50cfb - Fixed default Android enums [UE-8306]
[CL 2421518 by Josh Adams in Main branch]
2015-01-27 20:33:14 -05:00
Josh Adams
2593ae3cf3 - Added some in-editor documentation/tips to clarify some of the project settings [UE-8127]
- Only allow ES31+AEP if the project settings allows it. Told user to restart editor if they change the ES31+AEP setting to fix the Launch On menu. (This is only until 4.8) [UE-6585]
- Noted that ES31 is only for Tegra K1, in the name [UE-6604]
- Hide JAVA_HOME settings on MacOS, as it would be confusing to try to find it

#codereview peter.sauerbrei,robert.jones

[CL 2420419 by Josh Adams in Main branch]
2015-01-27 10:57:03 -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
Ben Marsh
24edb4f290 [INTEGRATE] Change 2418497 by Robert.Jones@Pitbull-RJones on 2015/01/26 06:46:00
UE-8075 - Devices not updating post-SDK path change
	Fixed code so that it correctly references the device detection class.
	Added a 'force update' path so that upon successful SDK path updates the devices are rechecked right away instead of waiting up to 10 seconds.
	Cleared out old devices if the SDK path is empty/doesn't contain the adb executable

	Change to UEBuildAndroid so that empty SDK paths are no longer treated as valid paths on start up allowing things like SDKPath=("") to be overridden by env vars.

[CL 2419718 by Ben Marsh in Main branch]
2015-01-26 20:18:16 -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
02d7bd14b5 - No longer using curly brackets with {PROJECT_NAME} default, messes up in editor
- Fixed some tooltips
- Missed a file in changelist 2414384

#codereview peter.sauerbrei

[CL 2415309 by Josh Adams in Main branch]
2015-01-22 09:52:25 -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
Jaroslaw Palczynski
adecd4aaad UHT: Allows defining multiple UCLASSes in one header file.
[CL 2412156 by Jaroslaw Palczynski in Main branch]
2015-01-20 09:33:54 -05:00
Steve Robb
0756ef15b9 Delegate comparisons deprecated, lots of other associated code deprecated, and lots of warning fixups:
* Multicast delegate Add* calls now return FDelegateHandles, and Remove* calls are now all deprecated, except for a new Remove function which takes a FDelegateHandle.
* New FConsoleManager::RegisterConsoleVariableSink_Handle and UnregisterConsoleVariableSink_Handle functions which work in terms of FConsoleVariableSinkHandle.
* Timer calls which don't take FTimerHandles are deprecated.
* FTicker::AddTicker now returns an FDelegateHandle and is removed by an overloaded Remove function.
* DEFINE_ONLINE_DELEGATE* macros now define _Handle variants of the Add/Remove functions which return/take handles.
* Various other handle-based registration changes.
* Some unity build fixes.
* Some simplification of delegate code.
* Fixes for lots of existing code to use handle-based registration and unregistration.

#codereview robert.manuszewski

[CL 2400883 by Steve Robb in Main branch]
2015-01-08 09:29:27 -05:00
Michael Trepka
5df3be8fd1 On Mac, read Android SDK paths from .bash_profile and set evn variables using them
[CL 2386181 by Michael Trepka in Main branch]
2014-12-11 17:09:39 -05:00
Michael Trepka
9c522df7ef Initial support for Android deployment on Mac
[CL 2386013 by Michael Trepka in Main branch]
2014-12-11 15:30:24 -05:00
Josh Adams
fd3d1c2a1a [Important BUNs in here]
- Enabled ES31 for GitHub/P4 users (currently only works on a Tegra K1 with recent system software)
- Always use separate APKs - this means that all APKs will have -armv7-es2 (or whatever) in their name. This may affect scripts, etc people have written
- Fixed a bug when using multiple java libraries (for users who add their own libs)
- Properly collapse Android devices into a single device with multiple variants. LaunchOn will now choose the best format based on the connected device. If you want to override the format, you will need to use the ProjectLauncher
- Added Android serial number to the device type, in case you have multiple devices of the same type (also fixes [UE-3770])
#codereview niklas.smedberg,chris.babcock

[CL 2385821 by Josh Adams in Main branch]
2014-12-11 13:44:41 -05:00