Change webapk packages and directory structure

webapk/libs/client/BUILD.gn

Index: webapk/libs/client/BUILD.gn
diff --git a/webapk/libs/client/BUILD.gn b/webapk/libs/client/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..442cd70406958a4096a1927ec0fb8dc8906bc87a
--- /dev/null
+++ b/webapk/libs/client/BUILD.gn
@@ -0,0 +1,36 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+import("//webapk/libs/runtime_library_version.gni")
+
+android_library("client") {
+  java_files = [
+    "src/org/chromium/webapk/lib/client/DexOptimizer.java",
+    "src/org/chromium/webapk/lib/client/WebApkStateParams.java",
+    "src/org/chromium/webapk/lib/client/NavigationClient.java",
+    "src/org/chromium/webapk/lib/client/NotificationBuilderDelegate.java",
+    "src/org/chromium/webapk/lib/client/NotificationClient.java",
+    "src/org/chromium/webapk/lib/client/WebApkValidator.java",
+    "src/org/chromium/webapk/lib/client/WebApkSwitches.java",
+    "src/org/chromium/webapk/lib/client/WebApkVersionManager.java",
+  ]
+  deps = [
+    "//base:base_java",
+    "//third_party/android_tools:android_support_v13_java",
+    "//webapk/libs/common",
+  ]
+  srcjar_deps = [
+    ":runtime_library_version_java",
+    "//webapk/libs/runtime_library:webapk_service_aidl",
+  ]
+}
+
+java_cpp_template("runtime_library_version_java") {
+  package_name = "org/chromium/webapk/lib/client"
+  sources = [
+    "src/org/chromium/webapk/lib/client/WebApkVersion.template",
+  ]
+  defines = [ "CURRENT_RUNTIME_DEX_VERSION_VALUE=$runtime_library_version" ]
+}