merge from tools_r13

Change-Id: Iabd0b49a5c3ad991da1b4f636ecdf881b1c271aa

3 files changed, 0 insertions, 37 deletions

diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini
index 0e650bb..dabf166 100644
--- a/android/avd/hardware-properties.ini
+++ b/android/avd/hardware-properties.ini
@@ -83,18 +83,6 @@ default     = yes
 abstract    = Keyboard lid support
 description = Whether the QWERTY keyboard can be opened/closed.
 
-# The name of the hardware charmap for this device.
-#
-# NOTE: This should always be the default 'qwerty2' unless you have
-#        modified the system image accordingly. This name is sent to
-#        the kernel at boot time. Using an incorrect name will result
-#        in an unusable machine.
-name        = hw.keyboard.charmap
-type        = string
-default     = qwerty2
-abstract    = Keyboard charmap name
-description = Name of the system keyboard charmap file.
-
 # DPad keys
 name        = hw.dPad
 type        = boolean
diff --git a/android/avd/info.c b/android/avd/info.c
index 7e4f93e..f1514f2 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -1183,22 +1183,3 @@ avdInfo_getSkinInfo( AvdInfo*  i, char** pSkinName, char** pSkinDir )
     AFREE(skinPath);
     return;
 }
-
-char*
-avdInfo_getCharmapFile( AvdInfo* i, const char* charmapName )
-{
-    char        fileNameBuff[PATH_MAX];
-    const char* fileName;
-
-    if (charmapName == NULL || charmapName[0] == '\0')
-        return NULL;
-
-    if (strstr(charmapName, ".kcm") == NULL) {
-        snprintf(fileNameBuff, sizeof fileNameBuff, "%s.kcm", charmapName);
-        fileName = fileNameBuff;
-    } else {
-        fileName = charmapName;
-    }
-
-    return _avdInfo_getContentOrSdkFilePath(i, fileName);
-}
diff --git a/android/avd/info.h b/android/avd/info.h
index 34997b4..5192bb9 100644
--- a/android/avd/info.h
+++ b/android/avd/info.h
@@ -215,12 +215,6 @@ const char*  avdInfo_getContentPath( AvdInfo*  i );
  */
 void         avdInfo_getSkinInfo( AvdInfo*  i, char** pSkinName, char** pSkinDir );
 
-/* Find a charmap file named <charmapName>.kcm for this AVD.
- * Returns the path of the file on success, or NULL if not found.
- * The result string must be freed by the caller.
- */
-char*        avdInfo_getCharmapFile( AvdInfo* i, const char* charmapName );
-
 /* Returns TRUE iff in the Android build system */
 int          avdInfo_inAndroidBuild( AvdInfo*  i );