Ben Marsh 4cf17e6c44 Merging //UE4/Release-4.18 @ 3660388 to Release-Staging-4.18 (//UE4/Release-Staging-4.18) ...

#rb none
#jira

[CL 3662266 by Ben Marsh in Staging-4.18 branch]

2017-09-25 14:08:25 -04:00

..

gradle

Copying //UE4/Dev-Mobile to //UE4/Dev-Main (Source: //UE4/Dev-Mobile @ 3496193)

2017-06-16 20:17:59 -04:00

JavaLibs/downloader_library

Copying //UE4/Release-Staging-4.13 to //UE4/Dev-Main (Source: //UE4/Release-4.13 @ 3072953)

2016-08-05 17:47:48 -04:00

JavaTemplates

Add launch image support for Android (disabled for GearVR)

2015-08-28 19:34:42 -04:00

jni

- Initial "Fat" binary support for Android - multiple architectures at once, by compiling multiple .so's in one go of UBT (will be controlled by Project Settings, intentionally hidden for now)

2014-08-26 09:56:29 -04:00

libs

Copying //UE4/Release-Staging-4.13 to //UE4/Dev-Main (Source: //UE4/Release-4.13 @ 3072953)

2016-08-05 17:47:48 -04:00

res

Copying up 3 Android resource files somehow missed by Dev-Mobile integration

2016-07-20 08:41:00 -04:00

src/com

Merging //UE4/Release-4.18 @ 3660388 to Release-Staging-4.18 (//UE4/Release-Staging-4.18)

2017-09-25 14:08:25 -04:00

aar-imports.txt

Merging //UE4/Release-4.18 @ 3660388 to Release-Staging-4.18 (//UE4/Release-Staging-4.18)

2017-09-25 14:08:25 -04:00

AndroidOpenSourceProject.tps

Copying //UE4/Orion-Staging to //UE4/Main (Source: //Orion/Dev-General @ 2949393)

2016-04-22 11:21:10 -04:00

custom_rules.xml

Fix older Android SDK zipalign path for Ant and an issue for mac (.bat was hardcoded)

2015-06-22 12:52:23 -04:00

proguard-project.txt

Copying //UE4/Dev-Sequencer to //UE4/Main (Source: //UE4/Dev-Sequencer @ 3617642)

2017-08-30 09:37:09 -04:00