diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/android_runtime/AndroidRuntime.h | 4 | ||||
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h index 51e47e6..f3cfd97 100644 --- a/include/android_runtime/AndroidRuntime.h +++ b/include/android_runtime/AndroidRuntime.h @@ -45,6 +45,7 @@ public: }; void setArgv0(const char* argv0); + void addOption(const char* optionString, void* extra_info = NULL); /** * Register a set of methods in the specified class. @@ -63,8 +64,6 @@ public: */ static jclass findClass(JNIEnv* env, const char* className); - int addVmArguments(int argc, const char* const argv[]); - void start(const char *classname, const Vector<String8>& options); void exit(int code); @@ -116,7 +115,6 @@ public: private: static int startReg(JNIEnv* env); - void addOption(const char* optionString, void* extra_info = NULL); bool parseRuntimeOption(const char* property, char* buffer, const char* runtimeArg, diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index b56829d..c65efe4 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -954,6 +954,7 @@ struct ResTable_config DENSITY_XHIGH = ACONFIGURATION_DENSITY_XHIGH, DENSITY_XXHIGH = ACONFIGURATION_DENSITY_XXHIGH, DENSITY_XXXHIGH = ACONFIGURATION_DENSITY_XXXHIGH, + DENSITY_ANY = ACONFIGURATION_DENSITY_ANY, DENSITY_NONE = ACONFIGURATION_DENSITY_NONE }; @@ -1459,6 +1460,9 @@ public: // Loads an unmapped reference table from the package. status_t load(const ResTable_lib_header* const header); + // Adds mappings from the other DynamicRefTable + status_t addMappings(const DynamicRefTable& other); + // Creates a mapping from build-time package ID to run-time package ID for // the given package. status_t addMapping(const String16& packageName, uint8_t packageId); @@ -1553,7 +1557,7 @@ public: }; const char16_t* valueToString(const Res_value* value, size_t stringBlock, char16_t tmpBuffer[TMP_BUFFER_SIZE], - size_t* outLen); + size_t* outLen) const; struct bag_entry { ssize_t stringBlock; |