commit 7856965a6ba322cb5d770e832e0ae4fbc47efe80
author Jerome Gaillard <jgaillard@google.com> Tue Nov 27 16:22:52 2018 +0000
committer Jerome Gaillard <jgaillard@google.com> Fri Dec 07 16:26:10 2018 +0000
tree 5a19d48184e026dbde711a31274622de28401a95
parent d1a9d112984946f6b7c682f880980e3175f6d309

Update layoutlib to use the new init API

Bug: 117921091
Test: layoutlib tests
Change-Id: Ieaa7dc13bf90db6bb513beb4289c5fa73f5c7260

bridge/src/com/android/layoutlib/bridge/Bridge.java

diff --git a/bridge/src/com/android/layoutlib/bridge/Bridge.java b/bridge/src/com/android/layoutlib/bridge/Bridge.java
index be74049..fba3744 100644
--- a/bridge/src/com/android/layoutlib/bridge/Bridge.java
+++ b/bridge/src/com/android/layoutlib/bridge/Bridge.java
@@ -167,6 +167,7 @@
     @Override
     public boolean init(Map<String,String> platformProperties,
             File fontLocation,
+            String icuDataPath,
             Map<String, Map<String, Integer>> enumValueMap,
             LayoutLog log) {
         sPlatformProperties = platformProperties;

bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTestBase.java

diff --git a/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTestBase.java b/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTestBase.java
index fe919b5..12ece48 100644
--- a/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTestBase.java
+++ b/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTestBase.java
@@ -312,7 +312,7 @@
         File buildProp = new File(PLATFORM_DIR, "build.prop");
         File attrs = new File(res, "values" + File.separator + "attrs.xml");
         sBridge = new Bridge();
-        sBridge.init(ConfigGenerator.loadProperties(buildProp), fontLocation,
+        sBridge.init(ConfigGenerator.loadProperties(buildProp), fontLocation, null,
                 ConfigGenerator.getEnumMap(attrs), getLayoutLog());
         Bridge.getLock().lock();
         try {