Merge "aconfig: create first implementation of aconfig storage java read api" into main (ca660282) · Commits · e / os / android_build

tools/aconfig/.editorconfig

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		# EditorConfig is awesome: https://EditorConfig.org

		# top-most EditorConfig file
		root = true

		[*.java]
		indent_style = tab
		indent_size = 4

tools/aconfig/TEST_MAPPING

+6 −2

Original line number	Diff line number	Diff line
		@@ -94,12 +94,16 @@
		{
		// aconfig_storage read api cpp integration tests
		"name": "aconfig_storage_read_api.test.cpp"
		},
		{
		// aconfig_storage file cpp integration tests
		"name": "aconfig_storage_file.test.cpp"
		}
		],
		"postsubmit": [
		{
		// aconfig_storage file cpp integration tests
		"name": "aconfig_storage_file.test.cpp"
		// aconfig_storage read api java integration tests
		"name": "aconfig_storage_read_api.test.java"
		}
		]
		}

tools/aconfig/aconfig_storage_read_api/Android.bp

+25 −0

Original line number	Diff line number	Diff line
		@@ -111,3 +111,28 @@ cc_defaults {
		"liblog",
		],
		}

		rust_ffi_shared {
		name: "libaconfig_storage_read_api_rust_jni",
		crate_name: "aconfig_storage_read_api_rust_jni",
		srcs: ["srcs/lib.rs"],
		rustlibs: [
		"libaconfig_storage_read_api",
		"libanyhow",
		"libjni",
		],
		prefer_rlib: true,
		}

		java_library {
		name: "libaconfig_storage_read_api_java",
		srcs: [
		"srcs/*/.java",
		],
		required: ["libaconfig_storage_read_api_rust_jni"],
		min_sdk_version: "UpsideDownCake",
		apex_available: [
		"//apex_available:anyapex",
		"//apex_available:platform",
		],
		}

tools/aconfig/aconfig_storage_read_api/srcs/android/aconfig/storage/AconfigStorageReadAPI.java

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.aconfig.storage;

		import java.io.FileInputStream;
		import java.io.IOException;
		import java.nio.ByteBuffer;
		import java.nio.MappedByteBuffer;
		import java.nio.channels.FileChannel;
		import java.nio.channels.FileChannel.MapMode;

		import android.aconfig.storage.PackageReadContext;
		import android.aconfig.storage.FlagReadContext;
		import android.aconfig.storage.BooleanFlagValue;

		import dalvik.annotation.optimization.FastNative;

		public class AconfigStorageReadAPI {

		// Storage file dir on device
		private static final String STORAGEDIR = "/metadata/aconfig";

		// Stoarge file type
		public enum StorageFileType {
		PACKAGE_MAP,
		FLAG_MAP,
		FLAG_VAL,
		FLAG_INFO
		}

		// Map a storage file given file path
		public static MappedByteBuffer mapStorageFile(String file) throws IOException {
		FileInputStream stream = new FileInputStream(file);
		FileChannel channel = stream.getChannel();
		return channel.map(FileChannel.MapMode.READ_ONLY, 0, channel.size());
		}

		// Map a storage file given container and file type
		public static MappedByteBuffer getMappedFile(
		String container,
		StorageFileType type) throws IOException{
		switch (type) {
		case PACKAGE_MAP:
		return mapStorageFile(STORAGEDIR + "/maps/" + container + ".package.map");
		case FLAG_MAP:
		return mapStorageFile(STORAGEDIR + "/maps/" + container + ".flag.map");
		case FLAG_VAL:
		return mapStorageFile(STORAGEDIR + "/boot/" + container + ".val");
		case FLAG_INFO:
		return mapStorageFile(STORAGEDIR + "/boot/" + container + ".info");
		default:
		throw new IOException("Invalid storage file type");
		}
		}

		// JNI interface to get package read context
		@FastNative
		public static native PackageReadContext getPackageReadContext(
		ByteBuffer mappedFile, String packageName);

		// JNI interface to get flag read context
		@FastNative
		public static native FlagReadContext getFlagReadContext(
		ByteBuffer mappedFile, int packageId, String flagName);

		// JNI interface to get boolean flag value
		@FastNative
		public static native BooleanFlagValue getBooleanFlagValue(
		ByteBuffer mappedFile, int flagIndex);

		static {
		System.loadLibrary("aconfig_storage_read_api_rust_jni");
		}
		}

tools/aconfig/aconfig_storage_read_api/srcs/android/aconfig/storage/BooleanFlagValue.java

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		package android.aconfig.storage;
		/*
		* Copyright (C) 2024 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.
		*/

		public class BooleanFlagValue {
		public boolean mQuerySuccess;
		public String mErrorMessage;
		public boolean mFlagValue;

		public BooleanFlagValue(boolean querySuccess,
		String errorMessage,
		boolean value) {
		mQuerySuccess = querySuccess;
		mErrorMessage = errorMessage;
		mFlagValue = value;
		}
		}