Delete build directory (mostly).
To streamline our build, I've gone through
and eliminated the redundant build directory.
Strings in build/res have been moved into the
regular res/ directory and the Android.mk
file has been updated to no longer use the
non-existent build directory at all. Fixes b/9105428.
Unfortunately, one src file has to be in build to
make the open source/closed source builds work
properly since we don't have src overlays in the build.
Change-Id: I3b6066f20d08aaf887624313adcb4db768b5d022
diff --git a/Android.mk b/Android.mk
index d11f8fa..f17dee8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,7 @@
# Include res dir from emailcommon
emailcommon_dir := ../Email/emailcommon
-res_dir := res $(emailcommon_dir)/res build/res
+res_dir := res $(emailcommon_dir)/res
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
diff --git a/build/res/values/strings.xml b/build/res/values/strings.xml
deleted file mode 100644
index 9223c0b..0000000
--- a/build/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="account_manager_type_exchange" translatable="false">com.android.exchange</string>
- <string name="authority_email_provider" translatable="false">com.android.email.provider</string>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1716e35..7146543 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -195,4 +195,7 @@
<string name="account_setup_options_mail_window_1month">One month</string>
<!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25] -->
<string name="account_setup_options_mail_window_all">All</string>
+
+ <string name="account_manager_type_exchange" translatable="false">com.android.exchange</string>
+ <string name="authority_email_provider" translatable="false">com.android.email.provider</string>
</resources>
