Config: Deprecate most fields, and hook into ConfigBuildFlags

Copy 3.xml to 4.xml, and patch 4.xml to deal with the fact that
Config.DEBUG's value is no longer actually fixed.  We don't want
to modify 3.xml directly, because it's the official cupcake API.

Update current.xml to reflect the differences between 3.xml and 4.xml
and to reflect the new deprecation states.

The deprecated fields should be @hidden if possible before the
next API release, but it can't be done yet because there are
SDK-linked platform apps that use some of the deprecated fields.

Signed-off-by: Dave Bort <dbort@android.com>

api/current.xml

@@ -125574,7 +125574,6 @@
  type="boolean"
  transient="false"
  volatile="false"
- value="false"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -125588,7 +125587,7 @@
  value="true"
  static="true"
  final="true"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 </field>
@@ -125599,7 +125598,7 @@
  value="false"
  static="true"
  final="true"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 </field>
@@ -125610,7 +125609,7 @@
  value="false"
  static="true"
  final="true"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 </field>
@@ -125618,10 +125617,9 @@
  type="boolean"
  transient="false"
  volatile="false"
- value="true"
  static="true"
  final="true"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 </field>

core/java/android/util/Config.java

@@ -1,51 +1,59 @@
-/* device/vmlibs-config/release/android/util/Config.java
-**
-** Copyright 2006, 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.
-*/
+/*
+ * Copyright (C) 2006 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.
+ */
 
 package android.util;
 
 /**
  * Build configuration.  The constants in this class vary depending
- * on release vs. debug build.  This is the configuration for release builds.
+ * on release vs. debug build.
  * {@more}
  */
 public final class Config
 {
     /**
-     * Is this a release build?
+     * If this is a debug build, this field will be true.
+     */
+    public static final boolean DEBUG = ConfigBuildFlags.DEBUG;
+
+    /*
+     * Deprecated fields
+     * TODO: Remove platform references to these and @hide them.
      */
-    public static final boolean RELEASE = true;
 
     /**
-     * Is this a debug build?
+     * Always the inverse of DEBUG.
      */
-    public static final boolean DEBUG = false;
+    @Deprecated
+    public static final boolean RELEASE = !DEBUG;
 
     /**
-     * Is profiling enabled?
+     * Always false.
      */
+    @Deprecated
     public static final boolean PROFILE = false;
-    
+
     /**
-     * Are VERBOSE log messages enabled?
+     * Always false.
      */
+    @Deprecated
     public static final boolean LOGV = false;
 
     /**
-     * Are DEBUG log messages enabled?
+     * Always true.
      */
+    @Deprecated
     public static final boolean LOGD = true;
 }