Merge change 1910 into donut (656a2726) · Commits · e / os / android_frameworks_base

include/utils/AssetManager.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,18 @@ public:
		*/
		AssetDir* openDir(const char* dirName);

		/*
		* Open a directory within a particular path of the asset manager.
		*
		* The contents of the directory are an amalgam of vendor-specific,
		* locale-specific, and generic assets stored loosely or in asset
		* packages. Depending on the cache setting and previous accesses,
		* this call may incur significant disk overhead.
		*
		* To open the top-level directory, pass in "".
		*/
		AssetDir* openNonAssetDir(void* cookie, const char* dirName);

		/*
		* Get the type of a file in the asset hierarchy. They will either
		* be "regular" or "directory". [Currently only works for "regular".]

libs/utils/AssetManager.cpp

+57 −2

Original line number	Diff line number	Diff line
		@@ -900,6 +900,60 @@ AssetDir* AssetManager::openDir(const char* dirName)
		return pDir;
		}

		/*
		* Open a directory in the non-asset namespace.
		*
		* An "asset directory" is simply the combination of all files in all
		* locations, with ".gz" stripped for loose files. With app, locale, and
		* vendor defined, we have 8 directories and 2 Zip archives to scan.
		*
		* Pass in "" for the root dir.
		*/
		AssetDir* AssetManager::openNonAssetDir(void* cookie, const char* dirName)
		{
		AutoMutex _l(mLock);

		AssetDir* pDir = NULL;
		SortedVector<AssetDir::FileInfo>* pMergedInfo = NULL;

		LOG_FATAL_IF(mAssetPaths.size() == 0, "No assets added to AssetManager");
		assert(dirName != NULL);

		//printf("+++ openDir(%s) in '%s'\n", dirName, (const char*) mAssetBase);

		if (mCacheMode != CACHE_OFF && !mCacheValid)
		loadFileNameCacheLocked();

		pDir = new AssetDir;

		pMergedInfo = new SortedVector<AssetDir::FileInfo>;

		const size_t which = ((size_t)cookie)-1;

		if (which < mAssetPaths.size()) {
		const asset_path& ap = mAssetPaths.itemAt(which);
		if (ap.type == kFileTypeRegular) {
		LOGV("Adding directory %s from zip %s", dirName, ap.path.string());
		scanAndMergeZipLocked(pMergedInfo, ap, NULL, dirName);
		} else {
		LOGV("Adding directory %s from dir %s", dirName, ap.path.string());
		scanAndMergeDirLocked(pMergedInfo, ap, NULL, dirName);
		}
		}

		#if 0
		printf("FILE LIST:\n");
		for (i = 0; i < (size_t) pMergedInfo->size(); i++) {
		printf(" %d: (%d) '%s'\n", i,
		pMergedInfo->itemAt(i).getFileType(),
		(const char*) pMergedInfo->itemAt(i).getFileName());
		}
		#endif

		pDir->setFileList(pMergedInfo);
		return pDir;
		}

		/*
		* Scan the contents of the specified directory and merge them into the
		* "pMergedInfo" vector, removing previous entries if we find "exclude"
		@@ -1143,6 +1197,7 @@ bool AssetManager::scanAndMergeZipLocked(SortedVector<AssetDir::FileInfo>* pMerg
		LOGE("ARGH: name too long?\n");
		continue;
		}
		//printf("Comparing %s in %s?\n", nameBuf, dirName.string());
		if (dirNameLen == 0 \|\|
		(strncmp(nameBuf, dirName.string(), dirNameLen) == 0 &&
		nameBuf[dirNameLen] == '/'))
		@@ -1165,7 +1220,7 @@ bool AssetManager::scanAndMergeZipLocked(SortedVector<AssetDir::FileInfo>* pMerg
		createZipSourceNameLocked(zipName, dirName, info.getFileName()));

		contents.add(info);
		//printf("FOUND: file '%s'\n", (const char*) info.mFileName);
		//printf("FOUND: file '%s'\n", info.getFileName().string());
		} else {
		/* this is a subdir; add it if we don't already have it*/
		String8 subdirName(cp, nextSlash - cp);
		@@ -1181,7 +1236,7 @@ bool AssetManager::scanAndMergeZipLocked(SortedVector<AssetDir::FileInfo>* pMerg
		dirs.add(subdirName);
		}

		//printf("FOUND: dir '%s'\n", (const char*) subdirName);
		//printf("FOUND: dir '%s'\n", subdirName.string());
		}
		}
		}

tools/aapt/Command.cpp

+107 −23

Original line number	Diff line number	Diff line
		@@ -268,17 +268,19 @@ static String8 getAttribute(const ResXMLTree& tree, uint32_t attrRes, String8* o
		return str ? String8(str, len) : String8();
		}

		static int32_t getIntegerAttribute(const ResXMLTree& tree, uint32_t attrRes, String8* outError)
		static int32_t getIntegerAttribute(const ResXMLTree& tree, uint32_t attrRes,
		String8* outError, int32_t defValue = -1)
		{
		ssize_t idx = indexOfAttribute(tree, attrRes);
		if (idx < 0) {
		return -1;
		return defValue;
		}
		Res_value value;
		if (tree.getAttributeValue(idx, &value) != NO_ERROR) {
		if (value.dataType != Res_value::TYPE_INT_DEC) {
		if (value.dataType < Res_value::TYPE_FIRST_INT
		\|\| value.dataType > Res_value::TYPE_LAST_INT) {
		if (outError != NULL) *outError = "attribute is not an integer value";
		return -1;
		return defValue;
		}
		}
		return value.data;
		@@ -318,7 +320,15 @@ enum {
		VERSION_NAME_ATTR = 0x0101021c,
		LABEL_ATTR = 0x01010001,
		ICON_ATTR = 0x01010002,
		MIN_SDK_VERSION_ATTR = 0x0101020c
		MIN_SDK_VERSION_ATTR = 0x0101020c,
		REQ_TOUCH_SCREEN_ATTR = 0x01010227,
		REQ_KEYBOARD_TYPE_ATTR = 0x01010228,
		REQ_HARD_KEYBOARD_ATTR = 0x01010229,
		REQ_NAVIGATION_ATTR = 0x0101022a,
		REQ_FIVE_WAY_NAV_ATTR = 0x01010232,
		TARGET_SDK_VERSION_ATTR = 0x01010270,
		TEST_ONLY_ATTR = 0x01010272,
		DENSITY_ATTR = 0x0101026c,
		};

		const char *getComponentName(String8 &pkgName, String8 &componentName) {
		@@ -357,7 +367,8 @@ int doDump(Bundle* bundle)
		const char* filename = bundle->getFileSpecEntry(1);

		AssetManager assets;
		if (!assets.addAssetPath(String8(filename), NULL)) {
		void* assetsCookie;
		if (!assets.addAssetPath(String8(filename), &assetsCookie)) {
		fprintf(stderr, "ERROR: dump failed because assets could not be loaded\n");
		return 1;
		}
		@@ -543,15 +554,77 @@ int doDump(Bundle* bundle)
		goto bail;
		}
		printf("icon='%s'\n", icon.string());
		int32_t testOnly = getIntegerAttribute(tree, TEST_ONLY_ATTR, &error, 0);
		if (error != "") {
		fprintf(stderr, "ERROR getting 'android:testOnly' attribute: %s\n", error.string());
		goto bail;
		}
		if (testOnly != 0) {
		printf("testOnly='%d'\n", testOnly);
		}
		} else if (tag == "uses-sdk") {
		int32_t sdkVersion = getIntegerAttribute(tree, MIN_SDK_VERSION_ATTR, &error);
		int32_t code = getIntegerAttribute(tree, MIN_SDK_VERSION_ATTR, &error);
		if (error != "") {
		error = "";
		String8 name = getResolvedAttribute(&res, tree, MIN_SDK_VERSION_ATTR, &error);
		if (error != "") {
		fprintf(stderr, "ERROR getting 'android:minSdkVersion' attribute: %s\n", error.string());
		fprintf(stderr, "ERROR getting 'android:minSdkVersion' attribute: %s\n",
		error.string());
		goto bail;
		}
		if (sdkVersion != -1) {
		printf("sdkVersion:'%d'\n", sdkVersion);
		printf("sdkVersion:'%s'\n", name.string());
		} else if (code != -1) {
		printf("sdkVersion:'%d'\n", code);
		}
		code = getIntegerAttribute(tree, TARGET_SDK_VERSION_ATTR, &error);
		if (error != "") {
		error = "";
		String8 name = getResolvedAttribute(&res, tree, TARGET_SDK_VERSION_ATTR, &error);
		if (error != "") {
		fprintf(stderr, "ERROR getting 'android:targetSdkVersion' attribute: %s\n",
		error.string());
		goto bail;
		}
		printf("targetSdkVersion:'%s'\n", name.string());
		} else if (code != -1) {
		printf("targetSdkVersion:'%d'\n", code);
		}
		} else if (tag == "uses-configuration") {
		int32_t reqTouchScreen = getIntegerAttribute(tree,
		REQ_TOUCH_SCREEN_ATTR, NULL, 0);
		int32_t reqKeyboardType = getIntegerAttribute(tree,
		REQ_KEYBOARD_TYPE_ATTR, NULL, 0);
		int32_t reqHardKeyboard = getIntegerAttribute(tree,
		REQ_HARD_KEYBOARD_ATTR, NULL, 0);
		int32_t reqNavigation = getIntegerAttribute(tree,
		REQ_NAVIGATION_ATTR, NULL, 0);
		int32_t reqFiveWayNav = getIntegerAttribute(tree,
		REQ_FIVE_WAY_NAV_ATTR, NULL, 0);
		printf("uses-configuation:");
		if (reqTouchScreen != 0) {
		printf(" reqTouchScreen='%d'", reqTouchScreen);
		}
		if (reqKeyboardType != 0) {
		printf(" reqKeyboardType='%d'", reqKeyboardType);
		}
		if (reqHardKeyboard != 0) {
		printf(" reqHardKeyboard='%d'", reqHardKeyboard);
		}
		if (reqNavigation != 0) {
		printf(" reqNavigation='%d'", reqNavigation);
		}
		if (reqFiveWayNav != 0) {
		printf(" reqFiveWayNav='%d'", reqFiveWayNav);
		}
		printf("\n");
		} else if (tag == "supports-density") {
		int32_t dens = getIntegerAttribute(tree, DENSITY_ATTR, &error);
		if (error != "") {
		fprintf(stderr, "ERROR getting 'android:density' attribute: %s\n",
		error.string());
		goto bail;
		}
		printf("supports-density:'%d'\n", dens);
		}
		} else if (depth == 3 && withinApplication) {
		withinActivity = false;
		@@ -671,6 +744,17 @@ int doDump(Bundle* bundle)
		printf(" '%s'", localeStr);
		}
		printf("\n");
		AssetDir* dir = assets.openNonAssetDir(assetsCookie, "lib");
		if (dir != NULL) {
		if (dir->getFileCount() > 0) {
		printf("native-code:");
		for (size_t i=0; i<dir->getFileCount(); i++) {
		printf(" '%s'", dir->getFileName(i).string());
		}
		printf("\n");
		}
		delete dir;
		}
		} else if (strcmp("configurations", option) == 0) {
		Vector<ResTable_config> configs;
		res.getConfigurations(&configs);