Fix build after upstream merge

- Reference renamed file: COPYING -> LICENSE in Android.bp
- Fix constext_str calls now returning const char *
- Comment out cil_write_src_info_node which is not used on Android
- Include new selinux_internal.c source file

Bug: 253327909
Test: build and boot on bramble
Test: sediff between current and new policy; no change
Change-Id: I506479befb3c0b99136cd842b2a77a6a8bea18ed

checkpolicy/Android.bp

@@ -25,7 +25,7 @@ license {
         "SPDX-license-identifier-LGPL",
     ],
     license_text: [
-        "COPYING",
+        "LICENSE",
     ],
 }
 

libselinux/Android.bp

@@ -94,6 +94,7 @@ cc_defaults {
         "src/procattr.c",
         "src/regex.c",
         "src/reject_unknown.c",
+        "src/selinux_internal.c",
         "src/sestatus.c",
         "src/setenforce.c",
         "src/setfilecon.c",

libselinux/src/android/android_device.c

@@ -56,7 +56,7 @@ int selinux_android_context_with_level(const char * context,
 		goto out;
 	}
 
-	char * newString = context_str(ctx);
+	const char * newString = context_str(ctx);
 	if (!newString) {
 		goto out;
 	}
@@ -92,19 +92,19 @@ int selinux_android_setcontext(uid_t uid,
 			       const char *seinfo,
 			       const char *pkgname)
 {
-	char *orig_ctx_str = NULL, *ctx_str;
+	char *orig_ctx_str = NULL;
+	const char *ctx_str = NULL;
 	context_t ctx = NULL;
 	int rc = -1;
 
 	if (is_selinux_enabled() <= 0)
 		return 0;
 
-	rc = getcon(&ctx_str);
+	rc = getcon(&orig_ctx_str);
 	if (rc)
 		goto err;
 
-	ctx = context_new(ctx_str);
-	orig_ctx_str = ctx_str;
+	ctx = context_new(orig_ctx_str);
 	if (!ctx)
 		goto oom;
 
@@ -432,7 +432,8 @@ static int pkgdir_selabel_lookup(const char *pathname,
 {
     char *pkgname = NULL;
     struct pkg_info *info = NULL;
-    char *secontext = *secontextp;
+    const char *orig_ctx_str = *secontextp;
+    const char *ctx_str = NULL;
     context_t ctx = NULL;
     int rc = 0;
     unsigned int userid_from_path = 0;
@@ -458,7 +459,7 @@ static int pkgdir_selabel_lookup(const char *pathname,
         info->uid += userid_from_path * AID_USER_OFFSET;
     }
 
-    ctx = context_new(secontext);
+    ctx = context_new(orig_ctx_str);
     if (!ctx)
         goto err;
 
@@ -467,19 +468,19 @@ static int pkgdir_selabel_lookup(const char *pathname,
     if (rc < 0)
         goto err;
 
-    secontext = context_str(ctx);
-    if (!secontext)
+    ctx_str = context_str(ctx);
+    if (!ctx_str)
         goto err;
 
-    if (!strcmp(secontext, *secontextp))
+    if (!strcmp(ctx_str, orig_ctx_str))
         goto out;
 
-    rc = security_check_context(secontext);
+    rc = security_check_context(ctx_str);
     if (rc < 0)
         goto err;
 
     freecon(*secontextp);
-    *secontextp = strdup(secontext);
+    *secontextp = strdup(ctx_str);
     if (!(*secontextp))
         goto err;
 

libsepol/Android.bp

@@ -29,7 +29,7 @@ license {
         "legacy_unencumbered",
     ],
     license_text: [
-        "COPYING",
+        "LICENSE",
     ],
 }
 

libsepol/cil/src/cil_write_ast.c

@@ -546,6 +546,7 @@ static const char *macro_param_flavor_to_string(enum cil_flavor flavor)
 	return str;
 }
 
+/* ANDROID: not used.
 static void cil_write_src_info_node(FILE *out, struct cil_tree_node *node)
 {
 	struct cil_src_info *info = node->data;
@@ -557,6 +558,7 @@ static void cil_write_src_info_node(FILE *out, struct cil_tree_node *node)
 		fprintf(out, ";;* <?SRC_INFO_KIND> %u %s\n", info->hll_line, info->path);
 	}
 }
+*/
 
 void cil_write_ast_node(FILE *out, struct cil_tree_node *node)
 {

secilc/Android.bp

@@ -11,7 +11,7 @@ license {
         "SPDX-license-identifier-BSD",
     ],
     license_text: [
-        "COPYING",
+        "LICENSE",
     ],
 }