[android_webview] Android.mk file cleanup.

We don't use the android_webview_java target anymore, get rid of it
and the resource_map entries.
Also, get rid of the res_hack folder since we now have a real resources
folder in our source tree.

BUG=None
TEST=compile on android_aosp bot
TBR=miguelg@chromium.org

Review URL: https://codereview.chromium.org/540993002

Cr-Commit-Position: refs/heads/master@{#296695}

android_webview/Android.mk

@@ -7,31 +7,9 @@
 # glue layer in the Android tree.
 
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android_webview_java
-
-LOCAL_MODULE_TAGS := optional
-
-# Temporary extra dependency: force android_webview_java_with_new_resources to
-# be built whenever this target is built, so that we get build coverage until
-# the switch happens.
-LOCAL_ADDITIONAL_DEPENDENCIES := \
-    $(call intermediates-dir-for,JAVA_LIBRARIES,android_webview_java_with_new_resources,,COMMON)/javalib.jar
-
-
-include $(LOCAL_PATH)/java_library_common.mk
-# resource glue layer
-LOCAL_SRC_FILES += \
-    $(call all-java-files-under, ../content/public/android/java/resource_map) \
-    $(call all-java-files-under, ../ui/android/java/resource_map) \
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
 
 ########################################################
-# This is intended to replace android_webview_java once the Android side of
-# the code that uses the WebView is updated. In the transition period the
-# goal of having this here is to make sure the new build isn't broken.
+# This defines the target for the Chromium Java code and resources.
 include $(CLEAR_VARS)
 LOCAL_MODULE := android_webview_java_with_new_resources
 

android_webview/build/res_hack/values/values.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 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.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Do not put resources here. This file is intentionally empty.
-         It's only to work around a build system issue. -->
-</resources>

android_webview/build/resources_config.mk

@@ -9,14 +9,7 @@
 android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml
 
 # Resources.
-# The res_hack folder is necessary to defeat a build system "optimization" which
-# ends up skipping running aapt if there are no resource files in any of the
-# resources dirs. Unfortunately, because all of our resources are generated at
-# build time and because this check is performed when processing the Makefile
-# it tests positive when building from clean resulting in a build failure.
-# We defeat the optimization by including an empty values.xml file in the list.
 android_webview_resources_dirs := \
-    $(call my-dir)/res_hack \
     $(call my-dir)/../java/res \
     $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_content_resources/jarjar_res \
     $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_ui_resources/jarjar_res \

content/public/android/java/resource_map/OWNERS

-# Changes in this folder are guaranteed to affect the downstream
-# android_webview build. Adding one of the folks from the below list to the
-# review gives us time to prepare a matching change ahead of time so that our
-# downstream build can continue running smoothly.
-set noparent
-
-benm@chromium.org
-boliu@chromium.org
-michaelbai@chromium.org
-mkosiba@chromium.org
-mnaganov@chromium.org
-primiano@chromium.org
-sgurun@chromium.org
-torne@chromium.org

content/public/android/java/resource_map/org/chromium/content/R.java

-// Copyright 2012 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.
-
-package org.chromium.content;
-
-/**
- * Provide Android internal resources to Chrome's content layer.  This allows
- * classes that access resources via org.chromium.content.R to function properly
- * in webview.  In a normal Chrome build, content resources live in a res folder
- * in the content layer and the org.chromium.content.R class is generated at
- * build time based on these resources.  In webview, resources live in the
- * Android framework and can't be accessed directly from the content layer.
- * Instead, we copy resources needed by content into the Android framework and
- * use this R class to map resources IDs from org.chromium.content.R to
- * com.android.internal.R.
- */
-public final class R {
-    /** Attributes */
-    public static final class attr {
-        public static int select_dialog_multichoice;
-        public static int select_dialog_singlechoice;
-    }
-    /** Dimensions */
-    public static final class dimen {
-        public static int link_preview_overlay_radius;
-    }
-    /** Drawables */
-    public static final class drawable {
-        public static int ondemand_overlay;
-    }
-    /** id */
-    public static final class id {
-        public static int ampm;
-        public static int arrow_image;
-        public static int date_picker;
-        public static int date_time_suggestion_value;
-        public static int date_time_suggestion_label;
-        public static int hour;
-        public static int main_text;
-        public static int milli;
-        public static int minute;
-        public static int pickers;
-        public static int position_in_year;
-        public static int second;
-        public static int second_colon;
-        public static int second_dot;
-        public static int select_action_menu_select_all;
-        public static int select_action_menu_cut;
-        public static int select_action_menu_copy;
-        public static int select_action_menu_paste;
-        public static int select_action_menu_share;
-        public static int select_action_menu_web_search;
-        public static int sub_text;
-        public static int time_picker;
-        public static int year;
-    }
-    /** layouts */
-    public static final class layout {
-        public static int validation_message_bubble;
-    }
-    /** menus */
-    public static final class menu {
-        public static int select_action_menu;
-    }
-    /** strings */
-    public static final class string {
-        public static int accessibility_content_view;
-        public static int accessibility_datetime_picker_date;
-        public static int accessibility_datetime_picker_time;
-        public static int actionbar_share;
-        public static int actionbar_web_search;
-        public static int date_time_picker_dialog_title;
-        public static int media_player_error_button;
-        public static int media_player_error_text_invalid_progressive_playback;
-        public static int media_player_error_text_unknown;
-        public static int media_player_error_title;
-        public static int media_player_loading_video;
-        public static int profiler_error_toast;
-        public static int profiler_no_storage_toast;
-        public static int profiler_started_toast;
-        public static int profiler_stopped_toast;
-        public static int time_picker_dialog_am;
-        public static int time_picker_dialog_hour_minute_separator;
-        public static int time_picker_dialog_minute_second_separator;
-        public static int time_picker_dialog_second_subsecond_separator;
-        public static int time_picker_dialog_pm;
-    }
-    /** styles */
-    public static final class style {
-        public static int SelectPopupDialog;
-    }
-}

ui/android/java/resource_map/OWNERS

-# Changes in this folder are guaranteed to affect the downstream
-# android_webview build. Adding one of the folks from the below list to the
-# review gives us time to prepare a matching change ahead of time so that our
-# downstream build can continue running smoothly.
-set noparent
-
-benm@chromium.org
-boliu@chromium.org
-michaelbai@chromium.org
-mkosiba@chromium.org
-mnaganov@chromium.org
-primiano@chromium.org
-sgurun@chromium.org
-torne@chromium.org

ui/android/java/resource_map/org/chromium/ui/R.java

-// Copyright (c) 2012 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.
-
-package org.chromium.ui;
-
-/**
- * Provide Android internal resources to Chrome's ui layer.  This allows classes
- * that access resources via org.chromium.ui.R to function properly in webview.
- * In a normal Chrome build, ui resources live in a res folder in the ui layer
- * and the org.chromium.ui.R class is generated at build time based on these
- * resources.  In webview, resources live in the Android framework and can't be
- * accessed directly from the ui layer.  Instead, we copy resources needed by ui
- * into the Android framework and use this R class to map resources IDs from
- * org.chromium.ui.R to com.android.internal.R.
- */
-public final class R {
-    public static final class string {
-        public static int accessibility_date_picker_month;
-        public static int accessibility_date_picker_year;
-        public static int accessibility_date_picker_week;
-        public static int copy_to_clipboard_failure_message;
-        public static int low_memory_error;
-        public static int opening_file_error;
-        public static int color_picker_button_more;
-        public static int color_picker_hue;
-        public static int color_picker_saturation;
-        public static int color_picker_value;
-        public static int color_picker_button_set;
-        public static int color_picker_button_cancel;
-        public static int color_picker_dialog_title;
-        public static int color_picker_button_red;
-        public static int color_picker_button_cyan;
-        public static int color_picker_button_blue;
-        public static int color_picker_button_green;
-        public static int color_picker_button_magenta;
-        public static int color_picker_button_yellow;
-        public static int color_picker_button_black;
-        public static int color_picker_button_white;
-        public static int date_picker_dialog_set;
-        public static int date_picker_dialog_other_button_label;
-        public static int date_picker_dialog_clear;
-        public static int date_picker_dialog_title;
-        public static int month_picker_dialog_title;
-        public static int time_picker_dialog_title;
-        public static int week_picker_dialog_title;
-    }
-    public static final class id {
-        public static int dropdown_label;
-        public static int dropdown_popup_window;
-        public static int dropdown_sublabel;
-        public static int selected_color_view;
-        public static int title;
-        public static int more_colors_button;
-        public static int color_picker_advanced;
-        public static int color_picker_simple;
-        public static int color_button_swatch;
-        public static int more_colors_button_border;
-        public static int gradient;
-        public static int text;
-        public static int seek_bar;
-    }
-    public static final class layout {
-        public static int dropdown_item;
-        public static int color_picker_dialog_title;
-        public static int color_picker_dialog_content;
-        public static int color_picker_advanced_component;
-    }
-    public static final class drawable {
-        public static int color_button_background;
-        public static int color_picker_advanced_select_handle;
-    }
-    public static final class style {
-        public static int DropdownPopupWindow;
-    }
-    public static final class color {
-        public static int dropdown_dark_divider_color;
-        public static int dropdown_divider_color;
-        public static int color_picker_border_color;
-    }
-    public static final class dimen {
-        public static int dropdown_item_height;
-        public static int dropdown_item_divider_height;
-        public static int color_button_height;
-        public static int config_min_scaling_span;
-        public static int config_min_scaling_touch_major;
-    }
-}