From 59dfbb91ca9c7ef979a9f10e3875f881ed1ef0a5 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Thu, 17 Apr 2014 00:14:28 -0700 Subject: [PATCH] Fix build [DO NOT MERGE] The branch is missing some CLs for 64-bit support. So, until they are added, this change will fix the build. Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66 --- .../bridge/src/android/content/res/AssetManager_Delegate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java b/tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java index f3d6ba35f0e46..7df21ced98ad5 100644 --- a/tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java +++ b/tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java @@ -29,7 +29,7 @@ public class AssetManager_Delegate { @LayoutlibDelegate /*package*/ static int newTheme(AssetManager manager) { - return Resources_Theme_Delegate.getDelegateManager() + return (int) Resources_Theme_Delegate.getDelegateManager() .addNewDelegate(new Resources_Theme_Delegate()); }